From 555f44ae6d3305963617f3afca2aeebed51667ea Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 28 Jan 2023 19:14:51 -0800 Subject: [PATCH] [ci skip] spotlessApply with the new settings --- .../arc/bloodarsenal/client/ClientProxy.java | 22 ++- .../renderer/block/RenderBloodTNTPrimed.java | 28 ++- .../renderer/block/RenderTileLifeInfuser.java | 12 +- .../block/TileLifeInfuserRenderer.java | 10 +- .../block/TilePortableAltarRenderer.java | 12 +- .../item/TilePortableAltarItemRenderer.java | 7 +- .../entity/RenderEntityBloodHound.java | 18 +- .../client/renderer/item/RenderBow.java | 13 +- .../renderer/model/ModelLifeInfuser.java | 14 +- .../model/ModelPortableBloodAltar.java | 18 +- .../renderer/model/ModelVampireCostume.java | 39 ++-- .../arc/bloodarsenal/common/BloodArsenal.java | 67 +++---- .../common/BloodArsenalConfig.java | 61 +++---- .../common/BloodArsenalEventHooks.java | 37 ++-- .../common/BloodArsenalRecipes.java | 169 ++++++++++++++---- .../arc/bloodarsenal/common/CommonProxy.java | 10 +- .../common/block/BlockBloodCake.java | 21 ++- .../block/BlockBloodInfusedDiamond.java | 1 + .../block/BlockBloodInfusedGlowstone.java | 5 +- .../common/block/BlockBloodInfusedPlanks.java | 1 + .../common/block/BlockBloodInfusedWood.java | 6 +- .../common/block/BlockBloodLamp.java | 1 + .../common/block/BlockBloodStainedGlass.java | 7 +- .../common/block/BlockBloodStainedIce.java | 19 +- .../block/BlockBloodStainedPackedIce.java | 2 + .../common/block/BlockBloodStone.java | 7 +- .../common/block/BlockBloodTNT.java | 33 ++-- .../common/block/BlockBloodTorch.java | 1 + .../common/block/BlockBurnedString.java | 42 ++--- .../common/block/BlockCompactedMRS.java | 21 ++- .../common/block/BlockCompacter.java | 75 ++++---- .../common/block/BlockInfusedIron.java | 1 + .../common/block/BlockLPMaterializer.java | 24 +-- .../common/block/BlockLifeInfuser.java | 17 +- .../common/block/BlockPortableAltar.java | 26 +-- .../bloodarsenal/common/block/ModBlocks.java | 18 +- .../common/block/MultipartHandler.java | 16 +- .../common/entity/EntityBloodTNT.java | 10 +- .../common/entity/ModLivingDropsEvent.java | 12 +- .../common/entity/ai/AIAttackOnCollide.java | 26 ++- .../common/entity/ai/AIFollowOwner.java | 13 +- .../common/entity/ai/AIHurtByTarget.java | 18 +- .../common/entity/ai/AILeapAtTarget.java | 6 +- .../common/entity/ai/AIOwnerHurtByTarget.java | 4 +- .../common/entity/ai/AIOwnerHurtTarget.java | 4 +- .../common/entity/mob/EntityBloodHound.java | 39 ++-- .../bloodarsenal/common/gui/ConfigGui.java | 7 +- .../common/gui/ConfigGuiFactory.java | 5 +- .../bloodarsenal/common/gui/GuiHandler.java | 6 +- .../common/items/ItemBloodArsenal.java | 91 ++++------ .../common/items/ItemBloodCookie.java | 5 +- .../common/items/ItemBloodMoney.java | 19 +- .../common/items/ItemBloodOrange.java | 5 +- .../common/items/ItemBoundDiamondShards.java | 9 +- .../common/items/ItemJuiceAndCookies.java | 5 +- .../common/items/ItemSoulBooster.java | 10 +- .../common/items/ItemSoulNullifier.java | 35 ++-- .../bloodarsenal/common/items/ModItems.java | 32 ++-- .../items/armor/ElementalLifeImbuedArmor.java | 37 ++-- .../common/items/armor/GlassArmor.java | 7 +- .../common/items/armor/LifeImbuedArmor.java | 37 ++-- .../common/items/armor/VampireCostume.java | 16 +- .../bauble/EmpoweredSacrificeAmulet.java | 50 +++--- .../bauble/EmpoweredSelfSacrificeAmulet.java | 47 ++--- .../common/items/bauble/ItemBauble.java | 14 +- .../common/items/bauble/SacrificeAmulet.java | 33 ++-- .../items/bauble/SelfSacrificeAmulet.java | 30 ++-- .../common/items/bauble/VampireRing.java | 16 +- .../common/items/block/BloodStoneBlock.java | 1 + .../common/items/block/CompactedMRSBlock.java | 9 +- .../items/block/PortableAltarBlock.java | 10 +- .../common/items/book/BloodBurnedTome.java | 68 ++++--- .../common/items/book/RecipeHolder.java | 7 +- .../common/items/orb/TransparentOrb.java | 25 +-- .../common/items/sigil/SigilDivinity.java | 19 +- .../common/items/sigil/SigilEnder.java | 23 ++- .../common/items/sigil/SigilLightning.java | 20 ++- .../common/items/sigil/SigilSwimming.java | 19 +- .../common/items/sigil/SigilUtils.java | 19 +- .../items/sigil/holding/AHPacketHandler.java | 1 + .../sigil/holding/AHPacketProcessor.java | 4 +- .../holding/ContainerAugmentedHolding.java | 29 +-- .../sigil/holding/GuiAugmentedHolding.java | 7 +- .../holding/InventoryAugmentedHolding.java | 5 +- .../sigil/holding/SigilAugmentedHolding.java | 37 ++-- .../common/items/tool/BoundBow.java | 24 ++- .../common/items/tool/BoundIgniter.java | 28 ++- .../common/items/tool/BoundShears.java | 42 +++-- .../common/items/tool/BoundSickle.java | 63 +++---- .../items/tool/GlassDaggerOfSacrifice.java | 57 +++--- .../items/tool/GlassSacrificialDagger.java | 23 ++- .../common/items/tool/IFillable.java | 1 + .../common/items/tool/InfusedDiamond.java | 12 +- .../common/items/tool/InfusedDiamondAxe.java | 18 +- .../items/tool/InfusedDiamondPickaxe.java | 25 ++- .../items/tool/InfusedDiamondShovel.java | 15 +- .../items/tool/InfusedDiamondSword.java | 22 ++- .../common/items/tool/InfusedIronAxe.java | 25 ++- .../common/items/tool/InfusedIronPickaxe.java | 25 ++- .../common/items/tool/InfusedIronShovel.java | 25 ++- .../common/items/tool/InfusedIronSword.java | 19 +- .../common/items/tool/InfusedWoodAxe.java | 25 ++- .../common/items/tool/InfusedWoodPickaxe.java | 25 ++- .../common/items/tool/InfusedWoodShovel.java | 25 ++- .../common/items/tool/InfusedWoodSword.java | 19 +- .../common/items/tool/ToolCapabilities.java | 63 +++---- .../bloodarsenal/common/misc/WAILAPlugin.java | 95 +++++----- .../common/potion/PotionBloodArsenal.java | 11 +- .../common/rituals/RitualEffectEnchant.java | 27 +-- .../common/rituals/RitualEffectFishing.java | 29 +-- .../common/rituals/RitualEffectMidas.java | 35 ++-- .../rituals/RitualEffectMobDisable.java | 26 +-- .../common/rituals/RitualEffectWithering.java | 23 +-- .../common/rituals/RitualRegistry.java | 41 ++++- .../thaumcraft/BloodArsenalResearchItem.java | 25 +-- .../thaumcraft/BloodArsenalThaumcraft.java | 145 ++++++--------- .../thaumcraft/BloodWoodStaffUpdate.java | 20 +-- .../thaumcraft/BloodWoodWandUpdate.java | 17 +- .../common/thaumcraft/BloodyWandCap.java | 16 +- .../common/thaumcraft/ItemWandCaps.java | 15 +- .../common/thaumcraft/ItemWandCores.java | 16 +- .../tileentity/FluidTankRestricted.java | 1 + .../common/tileentity/PacketHandler.java | 55 +++--- .../common/tileentity/TileCompactedMRS.java | 66 ++++--- .../common/tileentity/TileCompacter.java | 1 + .../common/tileentity/TileLPMaterializer.java | 63 ++++--- .../common/tileentity/TileLifeInfuser.java | 62 ++++--- .../common/tileentity/TilePortableAltar.java | 164 ++++++++++------- .../container/ContainerPortableAltar.java | 4 +- .../common/tinkers/BloodArsenalModifiers.java | 10 +- .../common/tinkers/BloodArsenalTinkers.java | 49 ++--- .../common/tinkers/IClientCode.java | 1 + .../common/tinkers/ModSoulbound.java | 6 +- .../common/tinkers/TConEvents.java | 4 +- .../tinkers/TextureResourcePackBase.java | 57 +++--- .../TextureResourcePackBloodInfusedIron.java | 12 +- 136 files changed, 1979 insertions(+), 1530 deletions(-) diff --git a/src/main/java/com/arc/bloodarsenal/client/ClientProxy.java b/src/main/java/com/arc/bloodarsenal/client/ClientProxy.java index f26cf83..a2b3a18 100644 --- a/src/main/java/com/arc/bloodarsenal/client/ClientProxy.java +++ b/src/main/java/com/arc/bloodarsenal/client/ClientProxy.java @@ -1,5 +1,11 @@ package com.arc.bloodarsenal.client; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.world.World; +import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.common.MinecraftForge; + import com.arc.bloodarsenal.client.renderer.block.*; import com.arc.bloodarsenal.client.renderer.block.TilePortableAltarRenderer; import com.arc.bloodarsenal.client.renderer.block.item.TilePortableAltarItemRenderer; @@ -12,16 +18,13 @@ import com.arc.bloodarsenal.common.items.sigil.SigilUtils; 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; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.common.MinecraftForge; public class ClientProxy extends CommonProxy { + @Override public void init() { registerRenders(); @@ -35,11 +38,11 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(ModItems.bound_bow, new RenderBow()); RenderingRegistry.registerEntityRenderingHandler(EntityBloodTNT.class, new RenderBloodTNTPrimed()); - // RenderingRegistry.registerEntityRenderingHandler(EntityBloodHound.class, new + // RenderingRegistry.registerEntityRenderingHandler(EntityBloodHound.class, new // RenderEntityBloodHound(new ModelWolf(), new ModelWolf(), 0.5F)); - MinecraftForgeClient.registerItemRenderer( - Item.getItemFromBlock(ModBlocks.life_infuser), new RenderTileLifeInfuser()); + MinecraftForgeClient + .registerItemRenderer(Item.getItemFromBlock(ModBlocks.life_infuser), new RenderTileLifeInfuser()); ClientRegistry.bindTileEntitySpecialRenderer(TilePortableAltar.class, new TilePortableAltarRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileLifeInfuser.class, new TileLifeInfuserRenderer()); @@ -58,7 +61,8 @@ public class ClientProxy extends CommonProxy { @Override public void initRendering() { MinecraftForgeClient.registerItemRenderer( - ItemBlock.getItemFromBlock(ModBlocks.portable_altar), new TilePortableAltarItemRenderer()); + ItemBlock.getItemFromBlock(ModBlocks.portable_altar), + new TilePortableAltarItemRenderer()); } @Override diff --git a/src/main/java/com/arc/bloodarsenal/client/renderer/block/RenderBloodTNTPrimed.java b/src/main/java/com/arc/bloodarsenal/client/renderer/block/RenderBloodTNTPrimed.java index 52395e5..c556e1f 100644 --- a/src/main/java/com/arc/bloodarsenal/client/renderer/block/RenderBloodTNTPrimed.java +++ b/src/main/java/com/arc/bloodarsenal/client/renderer/block/RenderBloodTNTPrimed.java @@ -1,18 +1,22 @@ package com.arc.bloodarsenal.client.renderer.block; -import com.arc.bloodarsenal.common.block.ModBlocks; -import com.arc.bloodarsenal.common.entity.EntityBloodTNT; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; +import com.arc.bloodarsenal.common.block.ModBlocks; +import com.arc.bloodarsenal.common.entity.EntityBloodTNT; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderBloodTNTPrimed extends Render { + private RenderBlocks blockRenderer = new RenderBlocks(); public RenderBloodTNTPrimed() { @@ -25,13 +29,8 @@ public class RenderBloodTNTPrimed extends Render { * (Render PURPLE?", - false, - "Purple is always better than Red. But I won't tell you how to live your life. Even if it is incorrect.") + misc, + "Is RED > PURPLE?", + false, + "Purple is always better than Red. But I won't tell you how to live your life. Even if it is incorrect.") .getBoolean(isRedGood); - cakeIsLie = config.get(misc, "The cake is a lie", false, "The cake is a lie") - .getBoolean(cakeIsLie); - isGlassDangerous = config.get( - misc, "Is glass dangerous?", true, "Breaking glass is dangerous unless you're a wimp") + cakeIsLie = config.get(misc, "The cake is a lie", false, "The cake is a lie").getBoolean(cakeIsLie); + isGlassDangerous = config + .get(misc, "Is glass dangerous?", true, "Breaking glass is dangerous unless you're a wimp") .getBoolean(isGlassDangerous); config.save(); diff --git a/src/main/java/com/arc/bloodarsenal/common/BloodArsenalEventHooks.java b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalEventHooks.java index 422b3c1..d2b1f50 100644 --- a/src/main/java/com/arc/bloodarsenal/common/BloodArsenalEventHooks.java +++ b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalEventHooks.java @@ -1,12 +1,7 @@ package com.arc.bloodarsenal.common; -import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import com.arc.bloodarsenal.common.items.ModItems; -import com.arc.bloodarsenal.common.items.armor.GlassArmor; -import cpw.mods.fml.client.event.ConfigChangedEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockGlass; import net.minecraft.block.material.Material; @@ -24,7 +19,17 @@ import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.world.BlockEvent; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; + +import com.arc.bloodarsenal.common.items.ModItems; +import com.arc.bloodarsenal.common.items.armor.GlassArmor; + +import cpw.mods.fml.client.event.ConfigChangedEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry; + public class BloodArsenalEventHooks { + private Random rand = new Random(); @SubscribeEvent @@ -61,8 +66,8 @@ public class BloodArsenalEventHooks { if (armorStack != null && armorStack.getItem() instanceof GlassArmor) { if (entityAttacking instanceof EntityLivingBase) { - ((EntityLivingBase) entityAttacking) - .addPotionEffect(new PotionEffect( + ((EntityLivingBase) entityAttacking).addPotionEffect( + new PotionEffect( BloodArsenalConfig.bleedingID, rand.nextInt(3) * 20, rand.nextInt(1))); @@ -83,12 +88,8 @@ public class BloodArsenalEventHooks { if (entityLiving instanceof FakePlayer) return; if (entityLiving.isPotionActive(BloodArsenal.bleeding)) { - int amplifier = entityLiving - .getActivePotionEffect(BloodArsenal.bleeding) - .getAmplifier(); - int duration = entityLiving - .getActivePotionEffect(BloodArsenal.bleeding) - .getDuration(); + int amplifier = entityLiving.getActivePotionEffect(BloodArsenal.bleeding).getAmplifier(); + int duration = entityLiving.getActivePotionEffect(BloodArsenal.bleeding).getDuration(); int damage = (rand.nextInt(2) * (amplifier + 1) + rand.nextInt(2)); entityLiving.addPotionEffect(new PotionEffect(Potion.blindness.id, duration, 1)); @@ -100,16 +101,16 @@ public class BloodArsenalEventHooks { } if (entityLiving.isPotionActive(BloodArsenal.soulBurn)) { - int amplifier = entityLiving - .getActivePotionEffect(BloodArsenal.soulBurn) - .getAmplifier(); + int amplifier = entityLiving.getActivePotionEffect(BloodArsenal.soulBurn).getAmplifier(); entityLiving.setFire(2); if (entityLiving instanceof EntityPlayer && entityLiving.getHealth() > 0.0) { if (entityLiving.worldObj.getWorldTime() % (10 / (amplifier + 1)) == 0) { int lpToMinus = 1000 * (2 ^ (amplifier + 1)); SoulNetworkHandler.syphonAndDamageFromNetwork( - entityLiving.getCommandSenderName(), (EntityPlayer) entityLiving, lpToMinus); + entityLiving.getCommandSenderName(), + (EntityPlayer) entityLiving, + lpToMinus); } } } diff --git a/src/main/java/com/arc/bloodarsenal/common/BloodArsenalRecipes.java b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalRecipes.java index 1fb2d55..bcfcfed 100644 --- a/src/main/java/com/arc/bloodarsenal/common/BloodArsenalRecipes.java +++ b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalRecipes.java @@ -1,10 +1,5 @@ package com.arc.bloodarsenal.common; -import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; -import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry; -import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe; -import com.arc.bloodarsenal.common.block.ModBlocks; -import com.arc.bloodarsenal.common.items.ModItems; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -13,12 +8,32 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; +import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; +import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry; +import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe; + +import com.arc.bloodarsenal.common.block.ModBlocks; +import com.arc.bloodarsenal.common.items.ModItems; + public class BloodArsenalRecipes { + public static void registerAltarRecipes() { AltarRecipeRegistry.registerAltarRecipe( - new ItemStack(ModBlocks.blood_tnt), new ItemStack(Blocks.tnt), 3, 10000, 5, 5, false); + new ItemStack(ModBlocks.blood_tnt), + new ItemStack(Blocks.tnt), + 3, + 10000, + 5, + 5, + false); AltarRecipeRegistry.registerAltarRecipe( - new ItemStack(ModBlocks.blood_infused_wood), new ItemStack(Blocks.log), 2, 3000, 5, 5, false); + new ItemStack(ModBlocks.blood_infused_wood), + new ItemStack(Blocks.log), + 2, + 3000, + 5, + 5, + false); AltarRecipeRegistry.registerAltarRecipe( new ItemStack(ModBlocks.blood_infused_iron_block), new ItemStack(Blocks.iron_block), @@ -28,11 +43,29 @@ public class BloodArsenalRecipes { 5, false); AltarRecipeRegistry.registerAltarRecipe( - new ItemStack(ModItems.item_blood_cake), new ItemStack(Items.cake), 3, 10000, 5, 5, false); + new ItemStack(ModItems.item_blood_cake), + new ItemStack(Items.cake), + 3, + 10000, + 5, + 5, + false); AltarRecipeRegistry.registerAltarRecipe( - new ItemStack(ModItems.blood_infused_iron), new ItemStack(Items.iron_ingot), 3, 6000, 5, 5, false); + new ItemStack(ModItems.blood_infused_iron), + new ItemStack(Items.iron_ingot), + 3, + 6000, + 5, + 5, + false); AltarRecipeRegistry.registerAltarRecipe( - new ItemStack(ModItems.blood_orange), new ItemStack(Items.dye, 1, 14), 1, 200, 5, 5, false); + new ItemStack(ModItems.blood_orange), + new ItemStack(Items.dye, 1, 14), + 1, + 200, + 5, + 5, + false); AltarRecipeRegistry.registerAltarRecipe( new ItemStack(ModItems.blood_infused_diamond_active), new ItemStack(ModItems.blood_infused_diamond_unactive), @@ -42,9 +75,21 @@ public class BloodArsenalRecipes { 5, false); AltarRecipeRegistry.registerAltarRecipe( - new ItemStack(ModItems.soul_fragment), new ItemStack(ModItems.heart), 4, 75000, 5, 5, false); + new ItemStack(ModItems.soul_fragment), + new ItemStack(ModItems.heart), + 4, + 75000, + 5, + 5, + false); AltarRecipeRegistry.registerAltarRecipe( - new ItemStack(ModItems.blood_cookie), new ItemStack(Items.cookie), 1, 2000, 5, 5, false); + new ItemStack(ModItems.blood_cookie), + new ItemStack(Items.cookie), + 1, + 2000, + 5, + 5, + false); AltarRecipeRegistry.registerAltarRecipe( new ItemStack(ModItems.blood_infused_glowstone_dust), new ItemStack(Items.glowstone_dust), @@ -54,7 +99,13 @@ public class BloodArsenalRecipes { 5, false); AltarRecipeRegistry.registerAltarRecipe( - new ItemStack(ModItems.blood_money), new ItemStack(Items.paper), 3, 10000, 5, 5, false); + new ItemStack(ModItems.blood_money), + new ItemStack(Items.paper), + 3, + 10000, + 5, + 5, + false); } public static void registerBindingRecipes() { @@ -66,10 +117,10 @@ public class BloodArsenalRecipes { new ItemStack(ModItems.blood_infused_diamond_active)); BindingRegistry.registerRecipe(new ItemStack(ModItems.bound_igniter), new ItemStack(Items.flint_and_steel)); if (BloodArsenal.isHalloween()) { - BindingRegistry.registerRecipe( - new ItemStack(ModItems.vampire_cape), new ItemStack(Items.leather_chestplate)); - BindingRegistry.registerRecipe( - new ItemStack(ModItems.vampire_greaves), new ItemStack(Items.leather_leggings)); + BindingRegistry + .registerRecipe(new ItemStack(ModItems.vampire_cape), new ItemStack(Items.leather_chestplate)); + BindingRegistry + .registerRecipe(new ItemStack(ModItems.vampire_greaves), new ItemStack(Items.leather_leggings)); BindingRegistry.registerRecipe(new ItemStack(ModItems.vampire_boots), new ItemStack(Items.leather_boots)); } } @@ -83,15 +134,23 @@ public class BloodArsenalRecipes { ItemStack demonicSlate = new ItemStack(WayofTime.alchemicalWizardry.ModItems.demonicSlate); ItemStack etherealSlate = new ItemStack(WayofTime.alchemicalWizardry.ModItems.baseItems, 1, 27); ItemStack weakOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.weakBloodOrb, 1, craftingConstant); - ItemStack apprenticeOrb = - new ItemStack(WayofTime.alchemicalWizardry.ModItems.apprenticeBloodOrb, 1, craftingConstant); - ItemStack magicianOrb = - new ItemStack(WayofTime.alchemicalWizardry.ModItems.magicianBloodOrb, 1, craftingConstant); + ItemStack apprenticeOrb = new ItemStack( + WayofTime.alchemicalWizardry.ModItems.apprenticeBloodOrb, + 1, + craftingConstant); + ItemStack magicianOrb = new ItemStack( + WayofTime.alchemicalWizardry.ModItems.magicianBloodOrb, + 1, + craftingConstant); ItemStack masterOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.masterBloodOrb, 1, craftingConstant); - ItemStack archmageOrb = - new ItemStack(WayofTime.alchemicalWizardry.ModItems.archmageBloodOrb, 1, craftingConstant); - ItemStack transcendentOrb = - new ItemStack(WayofTime.alchemicalWizardry.ModItems.transcendentBloodOrb, 1, craftingConstant); + ItemStack archmageOrb = new ItemStack( + WayofTime.alchemicalWizardry.ModItems.archmageBloodOrb, + 1, + craftingConstant); + ItemStack transcendentOrb = new ItemStack( + WayofTime.alchemicalWizardry.ModItems.transcendentBloodOrb, + 1, + craftingConstant); addOreDictBloodOrbRecipe( new ItemStack(ModBlocks.blood_stained_ice, 8), @@ -352,7 +411,14 @@ public class BloodArsenalRecipes { 'g', transcendentOrb); addOreDictBloodOrbRecipe( - new ItemStack(ModItems.blood_burned_string, 4), "aaa", "aba", "aaa", 'a', Items.string, 'b', weakOrb); + new ItemStack(ModItems.blood_burned_string, 4), + "aaa", + "aba", + "aaa", + 'a', + Items.string, + 'b', + weakOrb); addOreDictBloodOrbRecipe( new ItemStack(ModItems.sigil_of_augmented_holding), "aba", @@ -418,7 +484,13 @@ public class BloodArsenalRecipes { 'd', magicianOrb); addOreDictBloodOrbRecipe( - new ItemStack(ModItems.glass_helmet), "aaa", "aba", 'a', ModItems.glass_shard, 'b', apprenticeOrb); + new ItemStack(ModItems.glass_helmet), + "aaa", + "aba", + 'a', + ModItems.glass_shard, + 'b', + apprenticeOrb); addOreDictBloodOrbRecipe( new ItemStack(ModItems.glass_chestplate), "aba", @@ -438,7 +510,13 @@ public class BloodArsenalRecipes { 'b', apprenticeOrb); addOreDictBloodOrbRecipe( - new ItemStack(ModItems.glass_boots), "a a", "aba", 'a', ModItems.glass_shard, 'b', apprenticeOrb); + new ItemStack(ModItems.glass_boots), + "a a", + "aba", + 'a', + ModItems.glass_shard, + 'b', + apprenticeOrb); addOreDictBloodOrbRecipe( new ItemStack(ModItems.transparent_orb), "aba", @@ -510,7 +588,11 @@ public class BloodArsenalRecipes { 'a', ModItems.blood_infused_iron); addOreDictRecipe( - new ItemStack(ModBlocks.blood_stained_ice_packed), "aa", "aa", 'a', ModBlocks.blood_stained_ice); + new ItemStack(ModBlocks.blood_stained_ice_packed), + "aa", + "aa", + 'a', + ModBlocks.blood_stained_ice); addOreDictRecipe( new ItemStack(ModBlocks.blood_infused_glowstone), "aa", @@ -581,15 +663,28 @@ public class BloodArsenalRecipes { 'b', ModItems.blood_infused_stick); addOreDictRecipe( - new ItemStack(ModItems.blood_money, 1, 1), "aa", "aa", 'a', new ItemStack(ModItems.blood_money)); + new ItemStack(ModItems.blood_money, 1, 1), + "aa", + "aa", + 'a', + new ItemStack(ModItems.blood_money)); addOreDictRecipe( - new ItemStack(ModItems.blood_money, 1, 2), "aa", "aa", 'a', new ItemStack(ModItems.blood_money, 1, 1)); + new ItemStack(ModItems.blood_money, 1, 2), + "aa", + "aa", + 'a', + new ItemStack(ModItems.blood_money, 1, 1)); addOreDictRecipe( - new ItemStack(ModItems.blood_money, 1, 3), "aa", "aa", 'a', new ItemStack(ModItems.blood_money, 1, 2)); + new ItemStack(ModItems.blood_money, 1, 3), + "aa", + "aa", + 'a', + new ItemStack(ModItems.blood_money, 1, 2)); addShapelessOreDictRecipe(new ItemStack(ModBlocks.blood_infused_planks, 4), ModBlocks.blood_infused_wood); addShapelessOreDictRecipe( - new ItemStack(WayofTime.alchemicalWizardry.ModItems.blankSlate, 9), ModBlocks.blood_stone); + new ItemStack(WayofTime.alchemicalWizardry.ModItems.blankSlate, 9), + ModBlocks.blood_stone); addShapelessOreDictRecipe( new ItemStack(WayofTime.alchemicalWizardry.ModItems.reinforcedSlate, 9), new ItemStack(ModBlocks.blood_stone, 1, 1)); @@ -623,14 +718,14 @@ public class BloodArsenalRecipes { int craftingConstant = OreDictionary.WILDCARD_VALUE; ItemStack weakOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.weakBloodOrb, 1, craftingConstant); - // ItemStack apprenticeOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.apprenticeBloodOrb, 1, + // ItemStack apprenticeOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.apprenticeBloodOrb, 1, // craftingConstant); - // ItemStack magicianOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.magicianBloodOrb, 1, + // ItemStack magicianOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.magicianBloodOrb, 1, // craftingConstant); ItemStack masterOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.masterBloodOrb, 1, craftingConstant); - // ItemStack archmageOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.archmageBloodOrb, 1, + // ItemStack archmageOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.archmageBloodOrb, 1, // craftingConstant); - // ItemStack transcendentOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.transcendentBloodOrb, + // ItemStack transcendentOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.transcendentBloodOrb, // 1, craftingConstant); addOreDictBloodOrbRecipe( diff --git a/src/main/java/com/arc/bloodarsenal/common/CommonProxy.java b/src/main/java/com/arc/bloodarsenal/common/CommonProxy.java index 23e3b00..f699957 100644 --- a/src/main/java/com/arc/bloodarsenal/common/CommonProxy.java +++ b/src/main/java/com/arc/bloodarsenal/common/CommonProxy.java @@ -1,11 +1,13 @@ package com.arc.bloodarsenal.common; +import net.minecraft.world.World; + import com.arc.bloodarsenal.common.entity.EntityBloodTNT; import com.arc.bloodarsenal.common.tinkers.IClientCode; import cpw.mods.fml.common.registry.EntityRegistry; -import net.minecraft.world.World; public class CommonProxy { + public void init() { // registerEntityTrackers(); } @@ -23,9 +25,9 @@ public class CommonProxy { public static void registerEntityTrackers() { int entityID = EntityRegistry.findGlobalUniqueEntityId(); EntityRegistry.registerGlobalEntityID(EntityBloodTNT.class, "bloodTNT", entityID); - EntityRegistry.registerModEntity( - EntityBloodTNT.class, "bloodTNT", entityID, BloodArsenal.instance, 64, 100, true); - // EntityRegistry.registerModEntity(EntityBloodHound.class, "BloodHound", 3, BloodArsenal.instance, 96, + EntityRegistry + .registerModEntity(EntityBloodTNT.class, "bloodTNT", entityID, BloodArsenal.instance, 64, 100, true); + // EntityRegistry.registerModEntity(EntityBloodHound.class, "BloodHound", 3, BloodArsenal.instance, 96, // 3, true); } diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodCake.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodCake.java index 0f913ea..a7cf0a3 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodCake.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodCake.java @@ -1,12 +1,7 @@ package com.arc.bloodarsenal.common.block; -import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import com.arc.bloodarsenal.common.BloodArsenalConfig; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,12 +11,22 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import squeek.applecore.api.food.FoodValues; import squeek.applecore.api.food.IEdibleBlock; import squeek.applecore.api.food.ItemFoodProxy; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; + +import com.arc.bloodarsenal.common.BloodArsenalConfig; + +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @Optional.Interface(iface = "squeek.applecore.api.food.IEdibleBlock", modid = "AppleCore") public class BlockBloodCake extends Block implements IEdibleBlock { + private boolean isEdibleAtMaxHunger = false; @SideOnly(Side.CLIENT) @@ -105,8 +110,8 @@ public class BlockBloodCake extends Block implements IEdibleBlock { } @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, + float hitY, float hitZ) { eatCake(player); return true; } diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedDiamond.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedDiamond.java index c999f0e..e48604c 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedDiamond.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedDiamond.java @@ -5,6 +5,7 @@ import net.minecraft.block.material.Material; import net.minecraft.world.IBlockAccess; public class BlockBloodInfusedDiamond extends Block { + public BlockBloodInfusedDiamond() { super(Material.iron); setHardness(10.0F); diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedGlowstone.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedGlowstone.java index b02aa6a..d7c2b2e 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedGlowstone.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedGlowstone.java @@ -1,12 +1,15 @@ package com.arc.bloodarsenal.common.block; -import com.arc.bloodarsenal.common.items.ModItems; import java.util.Random; + import net.minecraft.block.BlockGlowstone; import net.minecraft.block.material.Material; import net.minecraft.item.Item; +import com.arc.bloodarsenal.common.items.ModItems; + public class BlockBloodInfusedGlowstone extends BlockGlowstone { + public BlockBloodInfusedGlowstone() { super(Material.glass); setHardness(0.5F); diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedPlanks.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedPlanks.java index 8376a45..ad5b2f7 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedPlanks.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedPlanks.java @@ -4,6 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; public class BlockBloodInfusedPlanks extends Block { + public BlockBloodInfusedPlanks() { super(Material.wood); setHardness(3.0F); diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedWood.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedWood.java index c6b1d30..1bcc98c 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedWood.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedWood.java @@ -1,13 +1,15 @@ package com.arc.bloodarsenal.common.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockRotatedPillar; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockBloodInfusedWood extends BlockRotatedPillar { + @SideOnly(Side.CLIENT) private IIcon top; diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodLamp.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodLamp.java index 102657b..9f58517 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodLamp.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodLamp.java @@ -4,6 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; public class BlockBloodLamp extends Block { + public BlockBloodLamp() { super(Material.iron); setStepSound(soundTypePiston); diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedGlass.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedGlass.java index d0fbb97..c5aad57 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedGlass.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedGlass.java @@ -1,13 +1,16 @@ package com.arc.bloodarsenal.common.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.Random; + import net.minecraft.block.BlockBreakable; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockBloodStainedGlass extends BlockBreakable { + public BlockBloodStainedGlass() { super("blood_stained_glass", Material.glass, false); setHardness(1.0F); diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedIce.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedIce.java index 05a6f80..8a149ea 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedIce.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedIce.java @@ -1,9 +1,8 @@ package com.arc.bloodarsenal.common.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockBreakable; import net.minecraft.block.material.Material; @@ -18,7 +17,11 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockBloodStainedIce extends BlockBreakable { + public BlockBloodStainedIce() { super("blood_stained_ice", Material.ice, false); slipperiness = 0.99F; @@ -54,7 +57,17 @@ public class BlockBloodStainedIce extends BlockBreakable { if (itemstack != null) items.add(itemstack); ForgeEventFactory.fireBlockHarvesting( - items, par1World, this, par3, par4, par5, par6, 0, 1.0f, true, par2EntityPlayer); + items, + par1World, + this, + par3, + par4, + par5, + par6, + 0, + 1.0f, + true, + par2EntityPlayer); for (ItemStack is : items) dropBlockAsItem(par1World, par3, par4, par5, is); } else { if (par1World.provider.isHellWorld) { diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedPackedIce.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedPackedIce.java index 30060ea..80c7a7e 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedPackedIce.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedPackedIce.java @@ -1,10 +1,12 @@ package com.arc.bloodarsenal.common.block; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; public class BlockBloodStainedPackedIce extends Block { + public BlockBloodStainedPackedIce() { super(Material.packedIce); slipperiness = 0.99F; diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStone.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStone.java index 072441a..733f866 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStone.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStone.java @@ -1,8 +1,7 @@ package com.arc.bloodarsenal.common.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -11,7 +10,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockBloodStone extends Block { + private IIcon blood_stone_1; private IIcon blood_stone_2; private IIcon blood_stone_3; diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTNT.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTNT.java index 857518f..d0e9f78 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTNT.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTNT.java @@ -1,10 +1,7 @@ package com.arc.bloodarsenal.common.block; -import com.arc.bloodarsenal.common.entity.EntityBloodTNT; -import com.arc.bloodarsenal.common.items.ModItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockTNT; import net.minecraft.client.renderer.texture.IIconRegister; @@ -17,7 +14,14 @@ import net.minecraft.util.IIcon; import net.minecraft.world.Explosion; import net.minecraft.world.World; +import com.arc.bloodarsenal.common.entity.EntityBloodTNT; +import com.arc.bloodarsenal.common.items.ModItems; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockBloodTNT extends BlockTNT { + @SideOnly(Side.CLIENT) private IIcon top; @@ -78,8 +82,8 @@ public class BlockBloodTNT extends BlockTNT { spawnTNT(par1World, par2, par3, par4, par5, null); } - public void spawnTNT( - World par1World, int par2, int par3, int par4, int par5, EntityLivingBase par6EntityLivingBase) { + public void spawnTNT(World par1World, int par2, int par3, int par4, int par5, + EntityLivingBase par6EntityLivingBase) { if (!par1World.isRemote) { if ((par5 & 1) == 1) { EntityBloodTNT entitytntprimed = new EntityBloodTNT( @@ -95,19 +99,10 @@ public class BlockBloodTNT extends BlockTNT { } @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 - || par5.getCurrentEquippedItem().getItem() == ModItems.bound_igniter)) { + 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 + || par5.getCurrentEquippedItem().getItem() == ModItems.bound_igniter)) { spawnTNT(par1World, par2, par3, par4, 1, par5); par1World.setBlockToAir(par2, par3, par4); par5.getCurrentEquippedItem().damageItem(1, par5); diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTorch.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTorch.java index 9d33547..7d73a29 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTorch.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTorch.java @@ -3,6 +3,7 @@ package com.arc.bloodarsenal.common.block; import net.minecraft.block.BlockTorch; public class BlockBloodTorch extends BlockTorch { + public BlockBloodTorch() { super(); setHardness(0.0F); diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockBurnedString.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBurnedString.java index 19daafd..fac3309 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockBurnedString.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBurnedString.java @@ -1,11 +1,9 @@ package com.arc.bloodarsenal.common.block; -import com.arc.bloodarsenal.common.items.ModItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.Iterator; import java.util.List; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; @@ -18,7 +16,13 @@ import net.minecraft.util.Direction; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import com.arc.bloodarsenal.common.items.ModItems; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockBurnedString extends Block { + public BlockBurnedString() { super(Material.circuits); setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.15625F, 1.0F); @@ -31,8 +35,8 @@ public class BlockBurnedString extends Block { } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool( - World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) { + public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, + int p_149668_4_) { return null; } @@ -63,8 +67,8 @@ public class BlockBurnedString extends Block { } @Override - public void setBlockBoundsBasedOnState( - IBlockAccess p_149719_1_, int p_149719_2_, int p_149719_3_, int p_149719_4_) { + public void setBlockBoundsBasedOnState(IBlockAccess p_149719_1_, int p_149719_2_, int p_149719_3_, + int p_149719_4_) { int l = p_149719_1_.getBlockMetadata(p_149719_2_, p_149719_3_, p_149719_4_); boolean flag = (l & 4) == 4; boolean flag1 = (l & 2) == 2; @@ -92,18 +96,13 @@ public class BlockBurnedString extends Block { } @Override - public void breakBlock( - World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_) { + public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, + int p_149749_6_) { this.func_150138_a(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_6_ | 1); } @Override - public void onBlockHarvested( - World p_149681_1_, - int p_149681_2_, - int p_149681_3_, - int p_149681_4_, - int p_149681_5_, + public void onBlockHarvested(World p_149681_1_, int p_149681_2_, int p_149681_3_, int p_149681_4_, int p_149681_5_, EntityPlayer p_149681_6_) { if (!p_149681_1_.isRemote) { if (p_149681_6_.getCurrentEquippedItem() != null @@ -153,8 +152,8 @@ public class BlockBurnedString extends Block { } @Override - public void onEntityCollidedWithBlock( - World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity p_149670_5_) { + public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, + Entity p_149670_5_) { if (!p_149670_1_.isRemote) { if ((p_149670_1_.getBlockMetadata(p_149670_2_, p_149670_3_, p_149670_4_) & 1) != 1) { this.func_150140_e(p_149670_1_, p_149670_2_, p_149670_3_, p_149670_4_); @@ -218,13 +217,8 @@ public class BlockBurnedString extends Block { } @SideOnly(Side.CLIENT) - public static boolean func_150139_a( - IBlockAccess p_150139_0_, - int p_150139_1_, - int p_150139_2_, - int p_150139_3_, - int p_150139_4_, - int p_150139_5_) { + public static boolean func_150139_a(IBlockAccess p_150139_0_, int p_150139_1_, int p_150139_2_, int p_150139_3_, + int p_150139_4_, int p_150139_5_) { int j1 = p_150139_1_ + Direction.offsetX[p_150139_5_]; int k1 = p_150139_3_ + Direction.offsetZ[p_150139_5_]; Block block = p_150139_0_.getBlock(j1, p_150139_2_, k1); diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockCompactedMRS.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockCompactedMRS.java index 87e37f2..efdac08 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockCompactedMRS.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockCompactedMRS.java @@ -1,13 +1,8 @@ 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.common.tileentity.TileCompactedMRS; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -21,7 +16,17 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.Explosion; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.rituals.Rituals; +import WayofTime.alchemicalWizardry.common.block.BlockMasterStone; +import WayofTime.alchemicalWizardry.common.items.ActivationCrystal; + +import com.arc.bloodarsenal.common.tileentity.TileCompactedMRS; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockCompactedMRS extends BlockMasterStone { + public BlockCompactedMRS() { super(); setBlockName("compacted_mrs"); @@ -124,8 +129,8 @@ public class BlockCompactedMRS extends BlockMasterStone { } @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what, + float these, float are) { TileCompactedMRS tileEntity = (TileCompactedMRS) world.getTileEntity(x, y, z); if (tileEntity != null) { diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java index e65602f..9ce83b0 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java @@ -1,22 +1,7 @@ package com.arc.bloodarsenal.common.block; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; -import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; -import WayofTime.alchemicalWizardry.api.rituals.Rituals; -import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import WayofTime.alchemicalWizardry.common.block.BlockAltar; -import WayofTime.alchemicalWizardry.common.block.BlockMasterStone; -import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.AltarComponent; -import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.AltarUpgradeComponent; -import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; -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 java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -32,7 +17,27 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidContainerRegistry; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; +import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; +import WayofTime.alchemicalWizardry.api.rituals.Rituals; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import WayofTime.alchemicalWizardry.common.block.BlockAltar; +import WayofTime.alchemicalWizardry.common.block.BlockMasterStone; +import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.AltarComponent; +import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.AltarUpgradeComponent; +import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars; +import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; + +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; + public class BlockCompacter extends BlockContainer { + private String ritualName; private int direction; @@ -72,8 +77,8 @@ public class BlockCompacter extends BlockContainer { } @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what, + float these, float are) { world.markBlockForUpdate(x, y, z); TileEntity tileEntity = world.getTileEntity(x, y, z); @@ -141,16 +146,18 @@ public class BlockCompacter extends BlockContainer { } int activationCost = Rituals.getCostForActivation(ritualName); - int cost = (activationCost * (int) multiplier) - / 2; // Divided by 2 since this fires twice apparently and also because I'm nice + int cost = (activationCost * (int) multiplier) / 2; // Divided by 2 since this fires + // twice apparently and also because + // I'm nice if (cost <= currentEssence) { compactRitual(tile); SoulNetworkHandler.syphonFromNetwork(owner, cost); --player.inventory.getCurrentItem().stackSize; } else { - player.addChatComponentMessage(new ChatComponentText( - StatCollector.translateToLocal("message.compacter.notEnoughLP"))); + player.addChatComponentMessage( + new ChatComponentText( + StatCollector.translateToLocal("message.compacter.notEnoughLP"))); return true; } } @@ -165,13 +172,14 @@ public class BlockCompacter extends BlockContainer { if (tier == 0) { return false; } else if (altar.getStackInSlot(0) != null) { - player.addChatComponentMessage(new ChatComponentText( - StatCollector.translateToLocal("message.compacter.itemInAltar"))); + player.addChatComponentMessage( + new ChatComponentText( + StatCollector.translateToLocal("message.compacter.itemInAltar"))); } else { float multiplier = 1; - AltarUpgradeComponent upgradeComponent = - UpgradedAltars.getUpgrades(world, x, y + 1, z, tier); + AltarUpgradeComponent upgradeComponent = UpgradedAltars + .getUpgrades(world, x, y + 1, z, tier); int speedUpgrades = upgradeComponent.getSpeedUpgrades(); int efficiencyUpgrades = upgradeComponent.getEfficiencyUpgrades(); @@ -203,12 +211,15 @@ public class BlockCompacter extends BlockContainer { SoulNetworkHandler.syphonFromNetwork(owner, cost); --player.inventory.getCurrentItem().stackSize; } else { - player.addChatComponentMessage(new ChatComponentText( - StatCollector.translateToLocal("message.compacter.notEnoughLP"))); + player.addChatComponentMessage( + new ChatComponentText( + StatCollector + .translateToLocal("message.compacter.notEnoughLP"))); } } else { - player.addChatComponentMessage(new ChatComponentText( - StatCollector.translateToLocal("message.compacter.wrongOrbTier"))); + player.addChatComponentMessage( + new ChatComponentText( + StatCollector.translateToLocal("message.compacter.wrongOrbTier"))); } } @@ -370,7 +381,9 @@ public class BlockCompacter extends BlockContainer { world.setBlockToAir(x + altarComponent.getX(), y + altarComponent.getY(), z + altarComponent.getZ()); world.setBlockToAir(x, y, z); world.markBlockForUpdate( - x + altarComponent.getX(), y + altarComponent.getY(), z + altarComponent.getZ()); + x + altarComponent.getX(), + y + altarComponent.getY(), + z + altarComponent.getZ()); } } diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockInfusedIron.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockInfusedIron.java index f6b9f05..92588c5 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockInfusedIron.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockInfusedIron.java @@ -5,6 +5,7 @@ import net.minecraft.block.material.Material; import net.minecraft.world.IBlockAccess; public class BlockInfusedIron extends Block { + public BlockInfusedIron() { super(Material.iron); setHardness(7.5F); diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockLPMaterializer.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockLPMaterializer.java index 75cdc6b..9cedd6f 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockLPMaterializer.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockLPMaterializer.java @@ -1,12 +1,7 @@ package com.arc.bloodarsenal.common.block; -import WayofTime.alchemicalWizardry.ModItems; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; -import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding; -import com.arc.bloodarsenal.common.tileentity.TileLPMaterializer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -23,7 +18,17 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidContainerRegistry; +import WayofTime.alchemicalWizardry.ModItems; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; +import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding; + +import com.arc.bloodarsenal.common.tileentity.TileLPMaterializer; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockLPMaterializer extends BlockContainer { + @SideOnly(Side.CLIENT) private IIcon output; @@ -68,8 +73,8 @@ public class BlockLPMaterializer extends BlockContainer { } @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what, + float these, float are) { TileLPMaterializer tileEntity = (TileLPMaterializer) world.getTileEntity(x, y, z); if (tileEntity == null) { @@ -157,8 +162,7 @@ public class BlockLPMaterializer extends BlockContainer { new ItemStack(item.getItem(), item.stackSize, item.getItemDamage())); if (item.hasTagCompound()) { - entityItem.getEntityItem().setTagCompound((NBTTagCompound) - item.getTagCompound().copy()); + entityItem.getEntityItem().setTagCompound((NBTTagCompound) item.getTagCompound().copy()); } float factor = 0.05F; diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockLifeInfuser.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockLifeInfuser.java index ffd8a35..223deea 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockLifeInfuser.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockLifeInfuser.java @@ -1,9 +1,7 @@ package com.arc.bloodarsenal.common.block; -import WayofTime.alchemicalWizardry.ModItems; -import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding; -import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -17,7 +15,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidContainerRegistry; +import WayofTime.alchemicalWizardry.ModItems; +import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding; + +import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser; + public class BlockLifeInfuser extends BlockContainer { + public BlockLifeInfuser() { super(Material.iron); setHardness(6.0F); @@ -28,8 +32,8 @@ public class BlockLifeInfuser extends BlockContainer { } @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what, + float these, float are) { TileLifeInfuser tileEntity = (TileLifeInfuser) world.getTileEntity(x, y, z); if (tileEntity == null || player.isSneaking()) { @@ -115,8 +119,7 @@ public class BlockLifeInfuser extends BlockContainer { new ItemStack(item.getItem(), item.stackSize, item.getItemDamage())); if (item.hasTagCompound()) { - entityItem.getEntityItem().setTagCompound((NBTTagCompound) - item.getTagCompound().copy()); + entityItem.getEntityItem().setTagCompound((NBTTagCompound) item.getTagCompound().copy()); } float factor = 0.05F; diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockPortableAltar.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockPortableAltar.java index 429b2ae..619d4b9 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockPortableAltar.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockPortableAltar.java @@ -1,14 +1,8 @@ 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.holding.SigilOfHolding; -import com.arc.bloodarsenal.common.tileentity.TilePortableAltar; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -25,7 +19,18 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.ModItems; +import WayofTime.alchemicalWizardry.api.items.IAltarManipulator; +import WayofTime.alchemicalWizardry.common.items.EnergyBattery; +import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding; + +import com.arc.bloodarsenal.common.tileentity.TilePortableAltar; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockPortableAltar extends BlockContainer { + @SideOnly(Side.CLIENT) private IIcon topIcon; @@ -93,8 +98,8 @@ public class BlockPortableAltar extends BlockContainer { } @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what, + float these, float are) { TilePortableAltar tileEntity = (TilePortableAltar) world.getTileEntity(x, y, z); if (tileEntity == null || player.isSneaking()) { @@ -191,8 +196,7 @@ public class BlockPortableAltar extends BlockContainer { new ItemStack(item.getItem(), item.stackSize, item.getItemDamage())); if (item.hasTagCompound()) { - entityItem.getEntityItem().setTagCompound((NBTTagCompound) - item.getTagCompound().copy()); + entityItem.getEntityItem().setTagCompound((NBTTagCompound) item.getTagCompound().copy()); } float factor = 0.05F; diff --git a/src/main/java/com/arc/bloodarsenal/common/block/ModBlocks.java b/src/main/java/com/arc/bloodarsenal/common/block/ModBlocks.java index e408a37..6db6a38 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/ModBlocks.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/ModBlocks.java @@ -1,5 +1,10 @@ package com.arc.bloodarsenal.common.block; +import java.util.ArrayList; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemBlock; + import com.arc.bloodarsenal.common.BloodArsenal; import com.arc.bloodarsenal.common.BloodArsenalConfig; import com.arc.bloodarsenal.common.items.block.BloodStoneBlock; @@ -7,11 +12,9 @@ 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 java.util.ArrayList; -import net.minecraft.block.Block; -import net.minecraft.item.ItemBlock; public class ModBlocks { + public static Block blood_stone; public static Block blood_tnt; public static Block blood_stained_glass; @@ -48,8 +51,10 @@ public class ModBlocks { blood_infused_glowstone = registerBlock(new BlockBloodInfusedGlowstone(), "blood_infused_glowstone"); blood_lamp = registerBlock(new BlockBloodLamp(), "blood_lamp"); blood_infused_diamond_block = registerBlock(new BlockBloodInfusedDiamond(), "blood_infused_diamond_block"); - portable_altar = (BlockPortableAltar) - registerBlock(new BlockPortableAltar(), PortableAltarBlock.class, "portable_altar"); + portable_altar = (BlockPortableAltar) registerBlock( + new BlockPortableAltar(), + PortableAltarBlock.class, + "portable_altar"); life_infuser = registerBlock(new BlockLifeInfuser(), "life_infuser"); compacter = registerBlock(new BlockCompacter(), "compacter"); lp_materializer = registerBlock(new BlockLPMaterializer(), "lp_materializer"); @@ -106,7 +111,6 @@ public class ModBlocks { try { Class clazz = Class.forName("com.arc.bloodarsenal.common.block.MultipartHandler"); clazz.newInstance(); - } catch (Throwable e) { - } + } catch (Throwable e) {} } } diff --git a/src/main/java/com/arc/bloodarsenal/common/block/MultipartHandler.java b/src/main/java/com/arc/bloodarsenal/common/block/MultipartHandler.java index a2a12cf..dfbcdcb 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/MultipartHandler.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/MultipartHandler.java @@ -1,24 +1,25 @@ /** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: + * This class was created by . It's distributed as part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php + * Botania is Open Source and distributed under the Botania License: http://botaniamod.net/license.php * * File Created @ [Sep 1, 2015, 5:32:15 PM (GMT)] */ package com.arc.bloodarsenal.common.block; -import codechicken.microblock.BlockMicroMaterial; -import codechicken.microblock.MicroMaterialRegistry; import java.util.ArrayList; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import codechicken.microblock.BlockMicroMaterial; +import codechicken.microblock.MicroMaterialRegistry; + public class MultipartHandler { + public MultipartHandler() { registerAllMultiparts(ModBlocks.blood_stone); registerAllMultiparts(ModBlocks.blood_stained_glass); @@ -52,6 +53,7 @@ public class MultipartHandler { private static void registerMultipart(Block block, int meta) { MicroMaterialRegistry.registerMaterial( - new BlockMicroMaterial(block, meta), block.getUnlocalizedName() + (meta == 0 ? "" : "_" + meta)); + new BlockMicroMaterial(block, meta), + block.getUnlocalizedName() + (meta == 0 ? "" : "_" + meta)); } } diff --git a/src/main/java/com/arc/bloodarsenal/common/entity/EntityBloodTNT.java b/src/main/java/com/arc/bloodarsenal/common/entity/EntityBloodTNT.java index da62dec..86224e0 100644 --- a/src/main/java/com/arc/bloodarsenal/common/entity/EntityBloodTNT.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/EntityBloodTNT.java @@ -1,13 +1,15 @@ package com.arc.bloodarsenal.common.entity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class EntityBloodTNT extends Entity { + public int fuse; private EntityLivingBase tntPlacedBy; @@ -18,8 +20,8 @@ public class EntityBloodTNT extends Entity { yOffset = height / 2.0F; } - public EntityBloodTNT( - World par1World, double par2, double par4, double par6, EntityLivingBase par8EntityLivingBase) { + public EntityBloodTNT(World par1World, double par2, double par4, double par6, + EntityLivingBase par8EntityLivingBase) { this(par1World); setPosition(par2, par4, par6); float f = (float) (Math.random() * Math.PI * 2.0D); diff --git a/src/main/java/com/arc/bloodarsenal/common/entity/ModLivingDropsEvent.java b/src/main/java/com/arc/bloodarsenal/common/entity/ModLivingDropsEvent.java index ab02dbe..6c5eca7 100644 --- a/src/main/java/com/arc/bloodarsenal/common/entity/ModLivingDropsEvent.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/ModLivingDropsEvent.java @@ -1,10 +1,7 @@ package com.arc.bloodarsenal.common.entity; -import com.arc.bloodarsenal.common.BloodArsenal; -import com.arc.bloodarsenal.common.items.ModItems; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.Random; + import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.passive.EntityWolf; @@ -13,7 +10,14 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraftforge.event.entity.living.LivingDropsEvent; +import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.items.ModItems; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry; + public class ModLivingDropsEvent { + @SubscribeEvent public void onEntityDrop(LivingDropsEvent event) { Random random = new Random(); diff --git a/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIAttackOnCollide.java b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIAttackOnCollide.java index 49dcabe..ef67aa6 100644 --- a/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIAttackOnCollide.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIAttackOnCollide.java @@ -9,6 +9,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; public class AIAttackOnCollide extends EntityAIBase { + World worldObj; EntityCreature attacker; int attackTick; @@ -60,10 +61,8 @@ public class AIAttackOnCollide extends EntityAIBase { @Override public boolean continueExecuting() { EntityLivingBase entitylivingbase = this.attacker.getAttackTarget(); - return entitylivingbase != null - && entitylivingbase.isEntityAlive() - && (!this.longMemory - ? !this.attacker.getNavigator().noPath() + return entitylivingbase != null && entitylivingbase.isEntityAlive() + && (!this.longMemory ? !this.attacker.getNavigator().noPath() : this.attacker.isWithinHomeDistance( MathHelper.floor_double(entitylivingbase.posX), MathHelper.floor_double(entitylivingbase.posY), @@ -85,13 +84,12 @@ public class AIAttackOnCollide extends EntityAIBase { public void updateTask() { EntityLivingBase entitylivingbase = this.attacker.getAttackTarget(); this.attacker.getLookHelper().setLookPositionWithEntity(entitylivingbase, 30.0F, 30.0F); - double d0 = this.attacker.getDistanceSq( - entitylivingbase.posX, entitylivingbase.boundingBox.minY, entitylivingbase.posZ); + double d0 = this.attacker + .getDistanceSq(entitylivingbase.posX, entitylivingbase.boundingBox.minY, entitylivingbase.posZ); double d1 = (double) (this.attacker.width * 2.0F * this.attacker.width * 2.0F + entitylivingbase.width); --this.field_75445_i; - if ((this.longMemory || this.attacker.getEntitySenses().canSee(entitylivingbase)) - && this.field_75445_i <= 0 + if ((this.longMemory || this.attacker.getEntitySenses().canSee(entitylivingbase)) && this.field_75445_i <= 0 && (this.field_151497_i == 0.0D && this.field_151495_j == 0.0D && this.field_151496_k == 0.0D || entitylivingbase.getDistanceSq(this.field_151497_i, this.field_151495_j, this.field_151496_k) >= 1.0D @@ -99,16 +97,12 @@ public class AIAttackOnCollide extends EntityAIBase { this.field_151497_i = entitylivingbase.posX; this.field_151495_j = entitylivingbase.boundingBox.minY; this.field_151496_k = entitylivingbase.posZ; - this.field_75445_i = - failedPathFindingPenalty + 4 + this.attacker.getRNG().nextInt(7); + this.field_75445_i = failedPathFindingPenalty + 4 + this.attacker.getRNG().nextInt(7); if (this.attacker.getNavigator().getPath() != null) { - PathPoint finalPathPoint = - this.attacker.getNavigator().getPath().getFinalPathPoint(); - if (finalPathPoint != null - && entitylivingbase.getDistanceSq( - finalPathPoint.xCoord, finalPathPoint.yCoord, finalPathPoint.zCoord) - < 1) { + PathPoint finalPathPoint = this.attacker.getNavigator().getPath().getFinalPathPoint(); + if (finalPathPoint != null && entitylivingbase + .getDistanceSq(finalPathPoint.xCoord, finalPathPoint.yCoord, finalPathPoint.zCoord) < 1) { failedPathFindingPenalty = 0; } else { failedPathFindingPenalty += 10; diff --git a/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIFollowOwner.java b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIFollowOwner.java index 634f3b3..f4e8b30 100644 --- a/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIFollowOwner.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIFollowOwner.java @@ -8,6 +8,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; public class AIFollowOwner extends EntityAIBase { + private EntityTameable thePet; private EntityLivingBase theOwner; World theWorld; @@ -77,8 +78,8 @@ public class AIFollowOwner extends EntityAIBase { * Updates the task */ public void updateTask() { - this.thePet.getLookHelper().setLookPositionWithEntity(this.theOwner, 10.0F, (float) - this.thePet.getVerticalFaceSpeed()); + this.thePet.getLookHelper() + .setLookPositionWithEntity(this.theOwner, 10.0F, (float) this.thePet.getVerticalFaceSpeed()); if (!this.thePet.isSitting()) { if (--this.field_75343_h <= 0) { @@ -95,12 +96,8 @@ public class AIFollowOwner extends EntityAIBase { for (int i1 = 0; i1 <= 4; ++i1) { if ((l < 1 || i1 < 1 || l > 3 || i1 > 3) && World.doesBlockHaveSolidTopSurface(this.theWorld, i + l, k - 1, j + i1) - && !this.theWorld - .getBlock(i + l, k, j + i1) - .isNormalCube() - && !this.theWorld - .getBlock(i + l, k + 1, j + i1) - .isNormalCube()) { + && !this.theWorld.getBlock(i + l, k, j + i1).isNormalCube() + && !this.theWorld.getBlock(i + l, k + 1, j + i1).isNormalCube()) { this.thePet.setLocationAndAngles( (double) ((float) (i + l) + 0.5F), (double) k, diff --git a/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIHurtByTarget.java b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIHurtByTarget.java index 830c302..37315fe 100644 --- a/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIHurtByTarget.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIHurtByTarget.java @@ -2,11 +2,13 @@ package com.arc.bloodarsenal.common.entity.ai; import java.util.Iterator; import java.util.List; + import net.minecraft.entity.EntityCreature; import net.minecraft.entity.ai.EntityAITarget; import net.minecraft.util.AxisAlignedBB; public class AIHurtByTarget extends EntityAITarget { + boolean entityCallsForHelp; private int field_142052_b; @@ -36,20 +38,18 @@ public class AIHurtByTarget extends EntityAITarget { List list = this.taskOwner.worldObj.getEntitiesWithinAABB( this.taskOwner.getClass(), AxisAlignedBB.getBoundingBox( - this.taskOwner.posX, - this.taskOwner.posY, - this.taskOwner.posZ, - this.taskOwner.posX + 1.0D, - this.taskOwner.posY + 1.0D, - this.taskOwner.posZ + 1.0D) - .expand(d0, 10.0D, d0)); + this.taskOwner.posX, + this.taskOwner.posY, + this.taskOwner.posZ, + this.taskOwner.posX + 1.0D, + this.taskOwner.posY + 1.0D, + this.taskOwner.posZ + 1.0D).expand(d0, 10.0D, d0)); Iterator iterator = list.iterator(); while (iterator.hasNext()) { EntityCreature entitycreature = (EntityCreature) iterator.next(); - if (this.taskOwner != entitycreature - && entitycreature.getAttackTarget() == null + if (this.taskOwner != entitycreature && entitycreature.getAttackTarget() == null && !entitycreature.isOnSameTeam(this.taskOwner.getAITarget())) { entitycreature.setAttackTarget(this.taskOwner.getAITarget()); } diff --git a/src/main/java/com/arc/bloodarsenal/common/entity/ai/AILeapAtTarget.java b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AILeapAtTarget.java index a3bc38e..11412f2 100644 --- a/src/main/java/com/arc/bloodarsenal/common/entity/ai/AILeapAtTarget.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AILeapAtTarget.java @@ -6,6 +6,7 @@ import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.util.MathHelper; public class AILeapAtTarget extends EntityAIBase { + EntityLiving leaper; EntityLivingBase leapTarget; float leapMotionY; @@ -24,10 +25,7 @@ public class AILeapAtTarget extends EntityAIBase { return false; } else { double d0 = this.leaper.getDistanceSqToEntity(this.leapTarget); - return d0 >= 4.0D - && d0 <= 16.0D - && this.leaper.onGround - && this.leaper.getRNG().nextInt(5) == 0; + return d0 >= 4.0D && d0 <= 16.0D && this.leaper.onGround && this.leaper.getRNG().nextInt(5) == 0; } } diff --git a/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIOwnerHurtByTarget.java b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIOwnerHurtByTarget.java index 111049d..00d9969 100644 --- a/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIOwnerHurtByTarget.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIOwnerHurtByTarget.java @@ -5,6 +5,7 @@ import net.minecraft.entity.ai.EntityAITarget; import net.minecraft.entity.passive.EntityTameable; public class AIOwnerHurtByTarget extends EntityAITarget { + EntityTameable theDefendingTameable; EntityLivingBase theOwnerAttacker; private int field_142051_e; @@ -29,8 +30,7 @@ public class AIOwnerHurtByTarget extends EntityAITarget { } else { this.theOwnerAttacker = entitylivingbase.getAITarget(); int i = entitylivingbase.func_142015_aE(); - return i != this.field_142051_e - && this.isSuitableTarget(this.theOwnerAttacker, false) + return i != this.field_142051_e && this.isSuitableTarget(this.theOwnerAttacker, false) && this.theDefendingTameable.func_142018_a(this.theOwnerAttacker, entitylivingbase); } } diff --git a/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIOwnerHurtTarget.java b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIOwnerHurtTarget.java index b91f71f..8791110 100644 --- a/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIOwnerHurtTarget.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIOwnerHurtTarget.java @@ -5,6 +5,7 @@ import net.minecraft.entity.ai.EntityAITarget; import net.minecraft.entity.passive.EntityTameable; public class AIOwnerHurtTarget extends EntityAITarget { + EntityTameable theEntityTameable; EntityLivingBase theTarget; private int field_142050_e; @@ -29,8 +30,7 @@ public class AIOwnerHurtTarget extends EntityAITarget { } else { this.theTarget = entitylivingbase.getLastAttacker(); int i = entitylivingbase.getLastAttackerTime(); - return i != this.field_142050_e - && this.isSuitableTarget(this.theTarget, false) + return i != this.field_142050_e && this.isSuitableTarget(this.theTarget, false) && this.theEntityTameable.func_142018_a(this.theTarget, entitylivingbase); } } diff --git a/src/main/java/com/arc/bloodarsenal/common/entity/mob/EntityBloodHound.java b/src/main/java/com/arc/bloodarsenal/common/entity/mob/EntityBloodHound.java index 247da3b..6f2f521 100644 --- a/src/main/java/com/arc/bloodarsenal/common/entity/mob/EntityBloodHound.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/mob/EntityBloodHound.java @@ -1,7 +1,5 @@ package com.arc.bloodarsenal.common.entity.mob; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.BlockColored; import net.minecraft.entity.Entity; @@ -25,7 +23,11 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class EntityBloodHound extends EntityTameable { + private float field_70926_e; private float field_70924_f; /** true is the wolf is wet else false */ @@ -121,11 +123,9 @@ public class EntityBloodHound extends EntityTameable { * Returns the sound this mob makes while it's alive. */ protected String getLivingSound() { - return this.isAngry() - ? "mob.wolf.growl" + return this.isAngry() ? "mob.wolf.growl" : (this.rand.nextInt(3) == 0 - ? (this.isTamed() && this.dataWatcher.getWatchableObjectFloat(18) < 10.0F - ? "mob.wolf.whine" + ? (this.isTamed() && this.dataWatcher.getWatchableObjectFloat(18) < 10.0F ? "mob.wolf.whine" : "mob.wolf.panting") : "mob.wolf.bark"); } @@ -240,18 +240,15 @@ public class EntityBloodHound extends EntityTameable { */ @SideOnly(Side.CLIENT) public float getShadingWhileShaking(float p_70915_1_) { - return 0.75F - + (this.prevTimeWolfIsShaking + (this.timeWolfIsShaking - this.prevTimeWolfIsShaking) * p_70915_1_) - / 2.0F - * 0.25F; + return 0.75F + (this.prevTimeWolfIsShaking + (this.timeWolfIsShaking - this.prevTimeWolfIsShaking) * p_70915_1_) + / 2.0F + * 0.25F; } @SideOnly(Side.CLIENT) public float getShakeAngle(float p_70923_1_, float p_70923_2_) { - float f2 = (this.prevTimeWolfIsShaking - + (this.timeWolfIsShaking - this.prevTimeWolfIsShaking) * p_70923_1_ - + p_70923_2_) - / 1.8F; + float f2 = (this.prevTimeWolfIsShaking + (this.timeWolfIsShaking - this.prevTimeWolfIsShaking) * p_70923_1_ + + p_70923_2_) / 1.8F; if (f2 < 0.0F) { f2 = 0.0F; @@ -259,8 +256,7 @@ public class EntityBloodHound extends EntityTameable { f2 = 1.0F; } - return MathHelper.sin(f2 * (float) Math.PI) - * MathHelper.sin(f2 * (float) Math.PI * 11.0F) + return MathHelper.sin(f2 * (float) Math.PI) * MathHelper.sin(f2 * (float) Math.PI * 11.0F) * 0.15F * (float) Math.PI; } @@ -383,8 +379,7 @@ public class EntityBloodHound extends EntityTameable { @SideOnly(Side.CLIENT) public float getTailRotation() { - return this.isAngry() - ? 1.5393804F + return this.isAngry() ? 1.5393804F : (this.isTamed() ? (0.55F - (20.0F - this.dataWatcher.getWatchableObjectFloat(18)) * 0.02F) * (float) Math.PI : ((float) Math.PI / 5F)); @@ -438,11 +433,9 @@ public class EntityBloodHound extends EntityTameable { } } - return p_142018_1_ instanceof EntityPlayer - && p_142018_2_ instanceof EntityPlayer - && !((EntityPlayer) p_142018_2_).canAttackPlayer((EntityPlayer) p_142018_1_) - ? false - : !(p_142018_1_ instanceof EntityHorse) || !((EntityHorse) p_142018_1_).isTame(); + return p_142018_1_ instanceof EntityPlayer && p_142018_2_ instanceof EntityPlayer + && !((EntityPlayer) p_142018_2_).canAttackPlayer((EntityPlayer) p_142018_1_) ? false + : !(p_142018_1_ instanceof EntityHorse) || !((EntityHorse) p_142018_1_).isTame(); } else { return false; } diff --git a/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGui.java b/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGui.java index bf9eb03..bed0670 100644 --- a/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGui.java +++ b/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGui.java @@ -2,15 +2,18 @@ package com.arc.bloodarsenal.common.gui; import static com.arc.bloodarsenal.common.BloodArsenalConfig.*; -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.client.config.*; import java.util.ArrayList; import java.util.List; + import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.ConfigElement; +import com.arc.bloodarsenal.common.BloodArsenal; +import cpw.mods.fml.client.config.*; + public class ConfigGui extends GuiConfig { + public ConfigGui(GuiScreen parentScreen) { super( parentScreen, diff --git a/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGuiFactory.java b/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGuiFactory.java index ac9fffc..4e09a4a 100644 --- a/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGuiFactory.java +++ b/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGuiFactory.java @@ -1,11 +1,14 @@ package com.arc.bloodarsenal.common.gui; -import cpw.mods.fml.client.IModGuiFactory; import java.util.Set; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import cpw.mods.fml.client.IModGuiFactory; + public class ConfigGuiFactory implements IModGuiFactory { + @Override public void initialize(Minecraft minecraftInstance) {} diff --git a/src/main/java/com/arc/bloodarsenal/common/gui/GuiHandler.java b/src/main/java/com/arc/bloodarsenal/common/gui/GuiHandler.java index 2f8cb61..1f2e2a3 100644 --- a/src/main/java/com/arc/bloodarsenal/common/gui/GuiHandler.java +++ b/src/main/java/com/arc/bloodarsenal/common/gui/GuiHandler.java @@ -1,13 +1,15 @@ package com.arc.bloodarsenal.common.gui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + 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; public class GuiHandler implements IGuiHandler { + @Override public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { switch (id) { diff --git a/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodArsenal.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodArsenal.java index 2405f9a..0d57db2 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodArsenal.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodArsenal.java @@ -1,81 +1,56 @@ package com.arc.bloodarsenal.common.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemBloodArsenal extends Item { - private static final String[] ITEM_NAMES = new String[] { - "amorphic_catalyst", - "blood_infused_stick", - "blood_infused_iron", - "soul_fragment", - "orange_juice", - "blood_infused_glowstone_dust", - "wolf_hide" - }; + + private static final String[] ITEM_NAMES = new String[] { "amorphic_catalyst", "blood_infused_stick", + "blood_infused_iron", "soul_fragment", "orange_juice", "blood_infused_glowstone_dust", "wolf_hide" }; @SideOnly(Side.CLIENT) private IIcon[] icons; public ItemBloodArsenal() { super(); - // setCreativeTab(BloodArsenal.BA_TAB); + // setCreativeTab(BloodArsenal.BA_TAB); } - /* @Override - public void registerIcons(IIconRegister iconRegister) - { - icons = new IIcon[ITEM_NAMES.length]; + /* + * @Override public void registerIcons(IIconRegister iconRegister) { icons = new IIcon[ITEM_NAMES.length]; for (int + * i = 0; i < ITEM_NAMES.length; ++i) { icons[i] = iconRegister.registerIcon("BloodArsenal:" + ITEM_NAMES[i]); } if + * (AlchemicalWizardry.wimpySettings) { ModItems.heart.setTextureName("BloodArsenal:heart2"); } else { + * ModItems.heart.setTextureName("BloodArsenal:heart"); } + */ - for (int i = 0; i < ITEM_NAMES.length; ++i) - { - icons[i] = iconRegister.registerIcon("BloodArsenal:" + ITEM_NAMES[i]); - } + // String unlocalizedName = this.getUnlocalizedName().replaceAll("item.", ""); + // itemIcon = iconRegister.registerIcon(BloodArsenal.MODID + ":" + unlocalizedName); - if (AlchemicalWizardry.wimpySettings) - { - ModItems.heart.setTextureName("BloodArsenal:heart2"); - } - else - { - ModItems.heart.setTextureName("BloodArsenal:heart"); - } - */ - - // String unlocalizedName = this.getUnlocalizedName().replaceAll("item.", ""); - // itemIcon = iconRegister.registerIcon(BloodArsenal.MODID + ":" + unlocalizedName); - - /* if (this.equals(ModItems.amorphic_catalyst)) - itemIcon = iconRegister.registerIcon("BloodArsenal:amorphic_catalyst"); - else if (this.equals(ModItems.blood_infused_iron)) - itemIcon = iconRegister.registerIcon("BloodArsenal:blood_infused_iron"); - else if (this.equals(ModItems.soul_fragment)) - itemIcon = iconRegister.registerIcon("BloodArsenal:soul_fragment"); - else if (this.equals(ModItems.heart)) - itemIcon = iconRegister.registerIcon("BloodArsenal:heart"); - else if (this.equals(ModItems.blood_infused_stick)) - itemIcon = iconRegister.registerIcon("BloodArsenal:blood_infused_stick"); - else if (this.equals(ModItems.blood_cookie)) - itemIcon = iconRegister.registerIcon("BloodArsenal:blood_cookie"); - else if (this.equals(ModItems.orange_juice)) - itemIcon = iconRegister.registerIcon("BloodArsenal:orange_juice"); - else if (this.equals(ModItems.blood_infused_glowstone_dust)) - itemIcon = iconRegister.registerIcon("BloodArsenal:blood_infused_glowstone_dust"); - else if (this.equals(ModItems.wolf_hide)) - itemIcon = iconRegister.registerIcon("BloodArsenal:wolf_hide"); - else if (this.equals(ModItems.blood_burned_string)) - itemIcon = iconRegister.registerIcon("BloodArsenal:blood_burned_string"); - else if (this.equals(ModItems.glass_shard)) - itemIcon = iconRegister.registerIcon("BloodArsenal:glass_shard"); - - } - */ + /* + * if (this.equals(ModItems.amorphic_catalyst)) itemIcon = + * iconRegister.registerIcon("BloodArsenal:amorphic_catalyst"); else if (this.equals(ModItems.blood_infused_iron)) + * itemIcon = iconRegister.registerIcon("BloodArsenal:blood_infused_iron"); else if + * (this.equals(ModItems.soul_fragment)) itemIcon = iconRegister.registerIcon("BloodArsenal:soul_fragment"); else if + * (this.equals(ModItems.heart)) itemIcon = iconRegister.registerIcon("BloodArsenal:heart"); else if + * (this.equals(ModItems.blood_infused_stick)) itemIcon = + * iconRegister.registerIcon("BloodArsenal:blood_infused_stick"); else if (this.equals(ModItems.blood_cookie)) + * itemIcon = iconRegister.registerIcon("BloodArsenal:blood_cookie"); else if (this.equals(ModItems.orange_juice)) + * itemIcon = iconRegister.registerIcon("BloodArsenal:orange_juice"); else if + * (this.equals(ModItems.blood_infused_glowstone_dust)) itemIcon = + * iconRegister.registerIcon("BloodArsenal:blood_infused_glowstone_dust"); else if (this.equals(ModItems.wolf_hide)) + * itemIcon = iconRegister.registerIcon("BloodArsenal:wolf_hide"); else if + * (this.equals(ModItems.blood_burned_string)) itemIcon = + * iconRegister.registerIcon("BloodArsenal:blood_burned_string"); else if (this.equals(ModItems.glass_shard)) + * itemIcon = iconRegister.registerIcon("BloodArsenal:glass_shard"); } + */ @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if (this.equals(ModItems.amorphic_catalyst)) { diff --git a/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodCookie.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodCookie.java index 82842bb..115324f 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodCookie.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodCookie.java @@ -1,7 +1,7 @@ package com.arc.bloodarsenal.common.items; -import com.arc.bloodarsenal.common.BloodArsenal; import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -10,7 +10,10 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import com.arc.bloodarsenal.common.BloodArsenal; + public class ItemBloodCookie extends ItemFood { + public ItemBloodCookie() { super(2, 0.3F, false); setUnlocalizedName("blood_cookie"); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodMoney.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodMoney.java index 3ea7389..5051314 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodMoney.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodMoney.java @@ -1,12 +1,7 @@ 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.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -18,8 +13,18 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; + +import com.arc.bloodarsenal.common.BloodArsenal; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemBloodMoney extends Item { - private final int[] MONEY_MULTIPLIER = new int[] {1, 4, 16, 64}; + + private final int[] MONEY_MULTIPLIER = new int[] { 1, 4, 16, 64 }; @SideOnly(Side.CLIENT) private IIcon[] icons; diff --git a/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodOrange.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodOrange.java index 1d7f290..eae7e21 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodOrange.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodOrange.java @@ -1,13 +1,16 @@ package com.arc.bloodarsenal.common.items; -import com.arc.bloodarsenal.common.BloodArsenal; import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import com.arc.bloodarsenal.common.BloodArsenal; + public class ItemBloodOrange extends ItemFood { + public ItemBloodOrange() { super(2, 0.2F, false); setUnlocalizedName("blood_orange"); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/ItemBoundDiamondShards.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemBoundDiamondShards.java index f4abdea..aa478d6 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/ItemBoundDiamondShards.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ItemBoundDiamondShards.java @@ -1,8 +1,7 @@ package com.arc.bloodarsenal.common.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -12,8 +11,12 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemBoundDiamondShards extends Item { - private final String[] shardTypes = new String[] {"", "air", "earth", "fire", "water", "dusk", "dawn"}; + + private final String[] shardTypes = new String[] { "", "air", "earth", "fire", "water", "dusk", "dawn" }; @SideOnly(Side.CLIENT) private IIcon[] icons; diff --git a/src/main/java/com/arc/bloodarsenal/common/items/ItemJuiceAndCookies.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemJuiceAndCookies.java index 7ab6f94..e4cb492 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/ItemJuiceAndCookies.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ItemJuiceAndCookies.java @@ -1,7 +1,7 @@ package com.arc.bloodarsenal.common.items; -import com.arc.bloodarsenal.common.BloodArsenal; import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -9,7 +9,10 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; +import com.arc.bloodarsenal.common.BloodArsenal; + public class ItemJuiceAndCookies extends ItemFood { + public ItemJuiceAndCookies() { super(6, 0.6F, false); setMaxStackSize(1); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/ItemSoulBooster.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemSoulBooster.java index 9deb372..47ff9a6 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/ItemSoulBooster.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ItemSoulBooster.java @@ -1,9 +1,7 @@ package com.arc.bloodarsenal.common.items; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; import java.util.List; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -14,7 +12,13 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +import com.arc.bloodarsenal.common.BloodArsenal; + public class ItemSoulBooster extends Item implements IBindable { + public ItemSoulBooster() { super(); setMaxStackSize(1); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/ItemSoulNullifier.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemSoulNullifier.java index 6c8dff9..909a1b3 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/ItemSoulNullifier.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ItemSoulNullifier.java @@ -1,11 +1,8 @@ package com.arc.bloodarsenal.common.items; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.ReflectionHelper; import java.util.Collection; import java.util.List; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -16,7 +13,14 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +import com.arc.bloodarsenal.common.BloodArsenal; +import cpw.mods.fml.relauncher.ReflectionHelper; + public class ItemSoulNullifier extends Item implements IBindable { + public ItemSoulNullifier() { super(); setMaxStackSize(1); @@ -70,20 +74,21 @@ public class ItemSoulNullifier extends Item implements IBindable { if (par3EntityPlayer.isBurning()) { par3EntityPlayer.extinguish(); removed = true; - } else - for (PotionEffect potion : potions) { - int id = potion.getPotionID(); - boolean badEffect; + } else for (PotionEffect potion : potions) { + int id = potion.getPotionID(); + boolean badEffect; - badEffect = ReflectionHelper.getPrivateValue( - Potion.class, Potion.potionTypes[id], new String[] {"isBadEffect", "field_76418_K"}); + badEffect = ReflectionHelper.getPrivateValue( + Potion.class, + Potion.potionTypes[id], + new String[] { "isBadEffect", "field_76418_K" }); - if (badEffect) { - par3EntityPlayer.removePotionEffect(id); - removed = true; - break; - } + if (badEffect) { + par3EntityPlayer.removePotionEffect(id); + removed = true; + break; } + } if (removed) { EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 500); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/ModItems.java b/src/main/java/com/arc/bloodarsenal/common/items/ModItems.java index f0b231b..e9f0dab 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/ModItems.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ModItems.java @@ -1,6 +1,19 @@ package com.arc.bloodarsenal.common.items; +import java.util.ArrayList; +import java.util.Arrays; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemReed; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.wands.StaffRod; +import thaumcraft.api.wands.WandCap; +import thaumcraft.api.wands.WandRod; import WayofTime.alchemicalWizardry.AlchemicalWizardry; + import com.arc.bloodarsenal.common.BloodArsenal; import com.arc.bloodarsenal.common.BloodArsenalConfig; import com.arc.bloodarsenal.common.block.ModBlocks; @@ -13,20 +26,12 @@ import com.arc.bloodarsenal.common.items.sigil.*; import com.arc.bloodarsenal.common.items.sigil.holding.SigilAugmentedHolding; import com.arc.bloodarsenal.common.items.tool.*; import com.arc.bloodarsenal.common.thaumcraft.*; + import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; -import java.util.ArrayList; -import java.util.Arrays; -import net.minecraft.item.Item; -import net.minecraft.item.ItemReed; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.wands.StaffRod; -import thaumcraft.api.wands.WandCap; -import thaumcraft.api.wands.WandRod; public class ModItems { + public static Item bound_bow; public static Item blood_orange; public static Item blood_infused_pickaxe_wood; @@ -167,8 +172,9 @@ public class ModItems { self_sacrifice_amulet = registerItem(new SelfSacrificeAmulet(), "self_sacrifice_amulet"); sacrifice_amulet = registerItem(new SacrificeAmulet(), "sacrifice_amulet"); empowered_sacrifice_amulet = registerItem(new EmpoweredSacrificeAmulet(), "empowered_sacrifice_amulet"); - empowered_self_sacrifice_amulet = - registerItem(new EmpoweredSelfSacrificeAmulet(), "empowered_self_sacrifice_amulet"); + empowered_self_sacrifice_amulet = registerItem( + new EmpoweredSelfSacrificeAmulet(), + "empowered_self_sacrifice_amulet"); } @Optional.Method(modid = "Thaumcraft") @@ -194,7 +200,7 @@ public class ModItems { WAND_CAP_BLOOD_INFUSED_IRON = new BloodyWandCap( "blood_iron", 0.85F, - Arrays.asList(new Aspect[] {Aspect.WATER}), + Arrays.asList(new Aspect[] { Aspect.WATER }), 0.80F, new ItemStack(wandCap, 1, 0), 5, diff --git a/src/main/java/com/arc/bloodarsenal/common/items/armor/ElementalLifeImbuedArmor.java b/src/main/java/com/arc/bloodarsenal/common/items/armor/ElementalLifeImbuedArmor.java index 01b271c..6676bd1 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/armor/ElementalLifeImbuedArmor.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/armor/ElementalLifeImbuedArmor.java @@ -1,11 +1,8 @@ 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 java.util.List; import java.util.Random; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; @@ -24,7 +21,14 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; +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; + public class ElementalLifeImbuedArmor extends ItemArmor implements ISpecialArmor, IFillable { + private final int maxLP = 100000; private String LP_STORED = "LPStored"; @@ -55,8 +59,10 @@ public class ElementalLifeImbuedArmor extends ItemArmor implements ISpecialArmor @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.armor.elementalLifeImbuedArmor")); - par3List.add(StatCollector.translateToLocal("tooltip.fillable.currentAmount") + " " + EnumChatFormatting.RED - + par1ItemStack.getTagCompound().getInteger(LP_STORED)); + par3List.add( + StatCollector.translateToLocal("tooltip.fillable.currentAmount") + " " + + EnumChatFormatting.RED + + par1ItemStack.getTagCompound().getInteger(LP_STORED)); } @Override @@ -155,19 +161,23 @@ public class ElementalLifeImbuedArmor extends ItemArmor implements ISpecialArmor } @Override - public ArmorProperties getProperties( - EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { + public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, + int slot) { final double absorbRatio = 0.5; 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); + 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); + 0, + absorbRatio * getArmorMaterial().getDamageReductionAmount(armorType) * 0.05, + absorbMax); } @Override @@ -176,8 +186,8 @@ public class ElementalLifeImbuedArmor extends ItemArmor implements ISpecialArmor } protected int getLPPerDamage(ItemStack stack) { - int unbreakingLevel = MathHelper.clamp_int( - EnchantmentHelper.getEnchantmentLevel(Enchantment.unbreaking.effectId, stack), 0, 4); + int unbreakingLevel = MathHelper + .clamp_int(EnchantmentHelper.getEnchantmentLevel(Enchantment.unbreaking.effectId, stack), 0, 4); return 100 * (5 - unbreakingLevel) / 5; } @@ -199,8 +209,7 @@ public class ElementalLifeImbuedArmor extends ItemArmor implements ISpecialArmor @Override public void onArmorTick(World world, EntityPlayer player, ItemStack armor) { - if (hasArmorSetItem(player, 0) - && hasArmorSetItem(player, 1) + if (hasArmorSetItem(player, 0) && hasArmorSetItem(player, 1) && hasArmorSetItem(player, 2) && hasArmorSetItem(player, 3)) { if (player.getHealth() < player.getMaxHealth() diff --git a/src/main/java/com/arc/bloodarsenal/common/items/armor/GlassArmor.java b/src/main/java/com/arc/bloodarsenal/common/items/armor/GlassArmor.java index dedc01e..d5e59f0 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/armor/GlassArmor.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/armor/GlassArmor.java @@ -1,8 +1,7 @@ package com.arc.bloodarsenal.common.items.armor; -import com.arc.bloodarsenal.common.BloodArsenal; -import com.arc.bloodarsenal.common.items.ModItems; import java.util.List; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; @@ -10,7 +9,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.items.ModItems; + public class GlassArmor extends ItemArmor { + public GlassArmor(int armorType) { super(BloodArsenal.glassArmor, 1, armorType); setMaxDamage(42); // The answer to everything in the universe 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 index a06813d..121afba 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/armor/LifeImbuedArmor.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/armor/LifeImbuedArmor.java @@ -1,11 +1,8 @@ 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 java.util.List; import java.util.Random; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; @@ -24,7 +21,14 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; +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; + public class LifeImbuedArmor extends ItemArmor implements ISpecialArmor, IFillable { + private int maxLP = 100000; private String LP_STORED = "LPStored"; public double absorbRatio = 0.5; @@ -57,8 +61,10 @@ public class LifeImbuedArmor extends ItemArmor implements ISpecialArmor, IFillab @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)); + par3List.add( + StatCollector.translateToLocal("tooltip.fillable.currentAmount") + " " + + EnumChatFormatting.RED + + par1ItemStack.getTagCompound().getInteger(LP_STORED)); } @Override @@ -157,17 +163,21 @@ public class LifeImbuedArmor extends ItemArmor implements ISpecialArmor, IFillab } @Override - public ArmorProperties getProperties( - EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { + 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); + 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); + 0, + absorbRatio * getArmorMaterial().getDamageReductionAmount(armorType) * 0.05, + absorbMax); } @Override @@ -176,8 +186,8 @@ public class LifeImbuedArmor extends ItemArmor implements ISpecialArmor, IFillab } protected int getLPPerDamage(ItemStack stack) { - int unbreakingLevel = MathHelper.clamp_int( - EnchantmentHelper.getEnchantmentLevel(Enchantment.unbreaking.effectId, stack), 0, 4); + int unbreakingLevel = MathHelper + .clamp_int(EnchantmentHelper.getEnchantmentLevel(Enchantment.unbreaking.effectId, stack), 0, 4); return 100 * (5 - unbreakingLevel) / 5; } @@ -199,8 +209,7 @@ public class LifeImbuedArmor extends ItemArmor implements ISpecialArmor, IFillab @Override public void onArmorTick(World world, EntityPlayer player, ItemStack armor) { - if (hasArmorSetItem(player, 0) - && hasArmorSetItem(player, 1) + if (hasArmorSetItem(player, 0) && hasArmorSetItem(player, 1) && hasArmorSetItem(player, 2) && hasArmorSetItem(player, 3)) { if (player.getHealth() < player.getMaxHealth() diff --git a/src/main/java/com/arc/bloodarsenal/common/items/armor/VampireCostume.java b/src/main/java/com/arc/bloodarsenal/common/items/armor/VampireCostume.java index 251f5a5..4d04a43 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/armor/VampireCostume.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/armor/VampireCostume.java @@ -1,10 +1,5 @@ package com.arc.bloodarsenal.common.items.armor; -import com.arc.bloodarsenal.client.renderer.model.ModelVampireCostume; -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.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -19,7 +14,15 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.arc.bloodarsenal.client.renderer.model.ModelVampireCostume; +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; + public class VampireCostume extends ItemArmor { + @SideOnly(Side.CLIENT) private IIcon chestIcon; @@ -76,8 +79,7 @@ public class VampireCostume extends ItemArmor { if (entityLiving instanceof EntityPlayer) { if (((EntityPlayer) entityLiving).getItemInUseDuration() > 0) { - EnumAction enumaction = - ((EntityPlayer) entityLiving).getItemInUse().getItemUseAction(); + EnumAction enumaction = ((EntityPlayer) entityLiving).getItemInUse().getItemUseAction(); if (enumaction == EnumAction.block) { this.model.heldItemRight = 3; diff --git a/src/main/java/com/arc/bloodarsenal/common/items/bauble/EmpoweredSacrificeAmulet.java b/src/main/java/com/arc/bloodarsenal/common/items/bauble/EmpoweredSacrificeAmulet.java index 3ee42b6..50c78fd 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/bauble/EmpoweredSacrificeAmulet.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/bauble/EmpoweredSacrificeAmulet.java @@ -1,20 +1,7 @@ package com.arc.bloodarsenal.common.items.bauble; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import baubles.api.BaubleType; -import baubles.api.IBauble; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; -import com.arc.bloodarsenal.common.BloodArsenalConfig; -import com.arc.bloodarsenal.common.items.ModItems; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -31,7 +18,25 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.living.LivingDeathEvent; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; +import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import baubles.api.BaubleType; +import baubles.api.IBauble; +import baubles.common.container.InventoryBaubles; +import baubles.common.lib.PlayerHandler; + +import com.arc.bloodarsenal.common.BloodArsenalConfig; +import com.arc.bloodarsenal.common.items.ModItems; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class EmpoweredSacrificeAmulet extends SacrificeAmulet implements IBauble, IBindable { + public EmpoweredSacrificeAmulet() { super(); setHasSubtypes(true); @@ -43,8 +48,7 @@ public class EmpoweredSacrificeAmulet extends SacrificeAmulet implements IBauble public void sacrificeHandler(LivingDeathEvent event) { Entity killer = event.source.getEntity(); - if (killer != null - && killer instanceof EntityPlayerMP + if (killer != null && killer instanceof EntityPlayerMP && !(killer instanceof FakePlayer) && BloodArsenalConfig.baublesIntegration) { EntityLivingBase victim = event.entityLiving; @@ -57,8 +61,7 @@ public class EmpoweredSacrificeAmulet extends SacrificeAmulet implements IBauble if (stack != null) { if (stack.getItem() == ModItems.empowered_sacrifice_amulet) { - EmpoweredSacrificeAmulet sacrificeAmulet = - (EmpoweredSacrificeAmulet) ModItems.empowered_sacrifice_amulet; + EmpoweredSacrificeAmulet sacrificeAmulet = (EmpoweredSacrificeAmulet) ModItems.empowered_sacrifice_amulet; float victimHealth = victim.getMaxHealth(); boolean healthGood = victimHealth > 4.0F; int lpReceived = healthGood ? 200 : 50; @@ -66,7 +69,8 @@ public class EmpoweredSacrificeAmulet extends SacrificeAmulet implements IBauble if (shouldExecute) { sacrificeAmulet.setStoredLP( - stack, Math.min(sacrificeAmulet.getStoredLP(stack) + (lpReceived * 5), 50000)); + stack, + Math.min(sacrificeAmulet.getStoredLP(stack) + (lpReceived * 5), 50000)); } } } @@ -102,15 +106,15 @@ public class EmpoweredSacrificeAmulet extends SacrificeAmulet implements IBauble SoulNetworkHandler.addCurrentEssenceToMaximum( owner, 50, - SoulNetworkHandler.getMaximumForOrbTier( - SoulNetworkHandler.getCurrentMaxOrb(owner))); + SoulNetworkHandler + .getMaximumForOrbTier(SoulNetworkHandler.getCurrentMaxOrb(owner))); setStoredLP(par1ItemStack, getStoredLP(par1ItemStack) - 50); } else if (this.getStoredLP(par1ItemStack) > 0) { SoulNetworkHandler.addCurrentEssenceToMaximum( owner, this.getStoredLP(par1ItemStack), - SoulNetworkHandler.getMaximumForOrbTier( - SoulNetworkHandler.getCurrentMaxOrb(owner))); + SoulNetworkHandler + .getMaximumForOrbTier(SoulNetworkHandler.getCurrentMaxOrb(owner))); setStoredLP(par1ItemStack, 0); } } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/bauble/EmpoweredSelfSacrificeAmulet.java b/src/main/java/com/arc/bloodarsenal/common/items/bauble/EmpoweredSelfSacrificeAmulet.java index 076e09f..0687c09 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/bauble/EmpoweredSelfSacrificeAmulet.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/bauble/EmpoweredSelfSacrificeAmulet.java @@ -1,20 +1,7 @@ package com.arc.bloodarsenal.common.items.bauble; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import baubles.api.BaubleType; -import baubles.api.IBauble; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; -import com.arc.bloodarsenal.common.BloodArsenalConfig; -import com.arc.bloodarsenal.common.items.ModItems; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -32,7 +19,25 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingAttackEvent; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; +import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import baubles.api.BaubleType; +import baubles.api.IBauble; +import baubles.common.container.InventoryBaubles; +import baubles.common.lib.PlayerHandler; + +import com.arc.bloodarsenal.common.BloodArsenalConfig; +import com.arc.bloodarsenal.common.items.ModItems; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class EmpoweredSelfSacrificeAmulet extends SelfSacrificeAmulet implements IBauble, IBindable { + public EmpoweredSelfSacrificeAmulet() { super(); setHasSubtypes(true); @@ -45,8 +50,7 @@ public class EmpoweredSelfSacrificeAmulet extends SelfSacrificeAmulet implements EntityLivingBase entityAttacked = event.entityLiving; Entity entityAttacking = event.source.getSourceOfDamage(); - if (entityAttacking != null - && entityAttacked != null + if (entityAttacking != null && entityAttacked != null && entityAttacked instanceof EntityPlayerMP && BloodArsenalConfig.baublesIntegration) { float damageDone = event.ammount; @@ -59,8 +63,7 @@ public class EmpoweredSelfSacrificeAmulet extends SelfSacrificeAmulet implements if (stack != null) { if (stack.getItem() == ModItems.empowered_self_sacrifice_amulet) { - EmpoweredSelfSacrificeAmulet selfSacrificeAmulet = - (EmpoweredSelfSacrificeAmulet) ModItems.empowered_self_sacrifice_amulet; + EmpoweredSelfSacrificeAmulet selfSacrificeAmulet = (EmpoweredSelfSacrificeAmulet) ModItems.empowered_self_sacrifice_amulet; int lpReceived = (int) damageDone; boolean shouldExecute = selfSacrificeAmulet.getStoredLP(stack) < 50000; @@ -114,15 +117,15 @@ public class EmpoweredSelfSacrificeAmulet extends SelfSacrificeAmulet implements SoulNetworkHandler.addCurrentEssenceToMaximum( owner, 50, - SoulNetworkHandler.getMaximumForOrbTier( - SoulNetworkHandler.getCurrentMaxOrb(owner))); + SoulNetworkHandler + .getMaximumForOrbTier(SoulNetworkHandler.getCurrentMaxOrb(owner))); setStoredLP(par1ItemStack, getStoredLP(par1ItemStack) - 50); } else if (this.getStoredLP(par1ItemStack) > 0) { SoulNetworkHandler.addCurrentEssenceToMaximum( owner, this.getStoredLP(par1ItemStack), - SoulNetworkHandler.getMaximumForOrbTier( - SoulNetworkHandler.getCurrentMaxOrb(owner))); + SoulNetworkHandler + .getMaximumForOrbTier(SoulNetworkHandler.getCurrentMaxOrb(owner))); setStoredLP(par1ItemStack, 0); } } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/bauble/ItemBauble.java b/src/main/java/com/arc/bloodarsenal/common/items/bauble/ItemBauble.java index 78fadd0..7517ea8 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/bauble/ItemBauble.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/bauble/ItemBauble.java @@ -1,17 +1,19 @@ package com.arc.bloodarsenal.common.items.bauble; -import baubles.api.IBauble; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.Optional; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import baubles.api.IBauble; +import baubles.common.container.InventoryBaubles; +import baubles.common.lib.PlayerHandler; +import cpw.mods.fml.common.Optional; + @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles") public abstract class ItemBauble extends Item implements IBauble { + public ItemBauble() { super(); setMaxStackSize(1); @@ -32,8 +34,8 @@ public abstract class ItemBauble extends Item implements IBauble { baubles.setInventorySlotContents(i, par1ItemStack.copy()); if (!par3EntityPlayer.capabilities.isCreativeMode) { - par3EntityPlayer.inventory.setInventorySlotContents( - par3EntityPlayer.inventory.currentItem, null); + par3EntityPlayer.inventory + .setInventorySlotContents(par3EntityPlayer.inventory.currentItem, null); } } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/bauble/SacrificeAmulet.java b/src/main/java/com/arc/bloodarsenal/common/items/bauble/SacrificeAmulet.java index a7d7745..58f40a0 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/bauble/SacrificeAmulet.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/bauble/SacrificeAmulet.java @@ -1,17 +1,7 @@ package com.arc.bloodarsenal.common.items.bauble; -import WayofTime.alchemicalWizardry.api.items.IAltarManipulator; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import baubles.api.BaubleType; -import baubles.api.IBauble; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; -import com.arc.bloodarsenal.common.BloodArsenalConfig; -import com.arc.bloodarsenal.common.items.ModItems; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -28,7 +18,22 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.living.LivingDeathEvent; +import WayofTime.alchemicalWizardry.api.items.IAltarManipulator; +import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import baubles.api.BaubleType; +import baubles.api.IBauble; +import baubles.common.container.InventoryBaubles; +import baubles.common.lib.PlayerHandler; + +import com.arc.bloodarsenal.common.BloodArsenalConfig; +import com.arc.bloodarsenal.common.items.ModItems; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class SacrificeAmulet extends ItemBauble implements IAltarManipulator, IBauble { + public SacrificeAmulet() { super(); MinecraftForge.EVENT_BUS.register(this); @@ -38,8 +43,7 @@ public class SacrificeAmulet extends ItemBauble implements IAltarManipulator, IB public void sacrificeHandler(LivingDeathEvent event) { Entity killer = event.source.getEntity(); - if (killer != null - && killer instanceof EntityPlayerMP + if (killer != null && killer instanceof EntityPlayerMP && !(killer instanceof FakePlayer) && BloodArsenalConfig.baublesIntegration) { EntityLivingBase victim = event.entityLiving; @@ -60,7 +64,8 @@ public class SacrificeAmulet extends ItemBauble implements IAltarManipulator, IB if (shouldExecute) { sacrificeAmulet.setStoredLP( - stack, Math.min(sacrificeAmulet.getStoredLP(stack) + (lpReceived * 2), 10000)); + stack, + Math.min(sacrificeAmulet.getStoredLP(stack) + (lpReceived * 2), 10000)); } } } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/bauble/SelfSacrificeAmulet.java b/src/main/java/com/arc/bloodarsenal/common/items/bauble/SelfSacrificeAmulet.java index 0bc175a..6714e38 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/bauble/SelfSacrificeAmulet.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/bauble/SelfSacrificeAmulet.java @@ -1,17 +1,7 @@ package com.arc.bloodarsenal.common.items.bauble; -import WayofTime.alchemicalWizardry.api.items.IAltarManipulator; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import baubles.api.BaubleType; -import baubles.api.IBauble; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; -import com.arc.bloodarsenal.common.BloodArsenalConfig; -import com.arc.bloodarsenal.common.items.ModItems; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -28,7 +18,22 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingAttackEvent; +import WayofTime.alchemicalWizardry.api.items.IAltarManipulator; +import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import baubles.api.BaubleType; +import baubles.api.IBauble; +import baubles.common.container.InventoryBaubles; +import baubles.common.lib.PlayerHandler; + +import com.arc.bloodarsenal.common.BloodArsenalConfig; +import com.arc.bloodarsenal.common.items.ModItems; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class SelfSacrificeAmulet extends ItemBauble implements IAltarManipulator, IBauble { + public SelfSacrificeAmulet() { super(); MinecraftForge.EVENT_BUS.register(this); @@ -38,8 +43,7 @@ public class SelfSacrificeAmulet extends ItemBauble implements IAltarManipulator public void selfSacrificeHandler(LivingAttackEvent event) { EntityLivingBase entityAttacked = event.entityLiving; - if (entityAttacked != null - && entityAttacked instanceof EntityPlayerMP + if (entityAttacked != null && entityAttacked instanceof EntityPlayerMP && BloodArsenalConfig.baublesIntegration) { float damageDone = event.ammount; diff --git a/src/main/java/com/arc/bloodarsenal/common/items/bauble/VampireRing.java b/src/main/java/com/arc/bloodarsenal/common/items/bauble/VampireRing.java index 172f135..e4b9856 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/bauble/VampireRing.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/bauble/VampireRing.java @@ -1,18 +1,22 @@ package com.arc.bloodarsenal.common.items.bauble; -import baubles.api.BaubleType; -import baubles.api.IBauble; -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; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; +import baubles.api.BaubleType; +import baubles.api.IBauble; + +import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenalConfig; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class VampireRing extends ItemBauble implements IBauble { + public VampireRing() { super(); setMaxStackSize(1); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/block/BloodStoneBlock.java b/src/main/java/com/arc/bloodarsenal/common/items/block/BloodStoneBlock.java index ce6138b..63e75f2 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/block/BloodStoneBlock.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/block/BloodStoneBlock.java @@ -5,6 +5,7 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; public class BloodStoneBlock extends ItemBlock { + public BloodStoneBlock(Block block) { super(block); setHasSubtypes(true); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/block/CompactedMRSBlock.java b/src/main/java/com/arc/bloodarsenal/common/items/block/CompactedMRSBlock.java index c99018a..6bdacc3 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/block/CompactedMRSBlock.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/block/CompactedMRSBlock.java @@ -1,9 +1,7 @@ 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 java.util.List; + import net.minecraft.block.Block; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; @@ -11,7 +9,12 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import WayofTime.alchemicalWizardry.api.rituals.Rituals; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class CompactedMRSBlock extends ItemBlock { + public CompactedMRSBlock(Block block) { super(block); setMaxStackSize(1); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/block/PortableAltarBlock.java b/src/main/java/com/arc/bloodarsenal/common/items/block/PortableAltarBlock.java index 32c516f..1f8f794 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/block/PortableAltarBlock.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/block/PortableAltarBlock.java @@ -1,8 +1,7 @@ package com.arc.bloodarsenal.common.items.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; @@ -10,7 +9,11 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class PortableAltarBlock extends ItemBlock { + public PortableAltarBlock(Block block) { super(block); setMaxStackSize(1); @@ -35,7 +38,8 @@ public class PortableAltarBlock extends ItemBlock { addStringToTooltip(StatCollector.translateToLocal("tooltip.altarTier") + " &c" + alterTier + "&7", par3List); addStringToTooltip( - StatCollector.translateToLocal("tooltip.currentEssence") + " &c" + currentEssence + "&7", par3List); + StatCollector.translateToLocal("tooltip.currentEssence") + " &c" + currentEssence + "&7", + par3List); addStringToTooltip(StatCollector.translateToLocal("tooltip.capacity") + " &c" + capacity + "&7", par3List); } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/book/BloodBurnedTome.java b/src/main/java/com/arc/bloodarsenal/common/items/book/BloodBurnedTome.java index 9e0ff04..0a91a13 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/book/BloodBurnedTome.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/book/BloodBurnedTome.java @@ -1,5 +1,16 @@ package com.arc.bloodarsenal.common.items.book; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import net.minecraftforge.oredict.OreDictionary; + import WayofTime.alchemicalWizardry.api.items.ShapelessBloodOrbRecipe; import amerifrance.guideapi.api.GuideRegistry; import amerifrance.guideapi.api.abstraction.CategoryAbstract; @@ -12,19 +23,12 @@ import amerifrance.guideapi.categories.CategoryItemStack; import amerifrance.guideapi.entries.EntryUniText; import amerifrance.guideapi.pages.PageIRecipe; import amerifrance.guideapi.pages.PageUnlocImage; + import com.arc.bloodarsenal.common.items.ModItems; import cpw.mods.fml.common.registry.GameRegistry; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import net.minecraftforge.oredict.OreDictionary; public class BloodBurnedTome { + public static Book burnedTome; public static List categories = new ArrayList(); private static final String R_LOC = "BloodArsenal:book/images/"; @@ -33,21 +37,21 @@ public class BloodBurnedTome { registerLifebringer(); BookBuilder bookBuilder = new BookBuilder(); - bookBuilder - .setCategories(categories) - .setUnlocBookTitle("guide.bloodarsenal.book.title") + bookBuilder.setCategories(categories).setUnlocBookTitle("guide.bloodarsenal.book.title") .setUnlocWelcomeMessage("guide.bloodarsenal.book.welcomeMessage") - .setUnlocDisplayName("guide.bloodarsenal.book.name") - .setAuthor("-An Arc Mage") + .setUnlocDisplayName("guide.bloodarsenal.book.name").setAuthor("-An Arc Mage") .setItemTexture("BloodArsenal:burned_tome"); burnedTome = bookBuilder.build(); GuideRegistry.registerBook(burnedTome); - GameRegistry.addRecipe(new ShapelessBloodOrbRecipe( - GuideRegistry.getItemStackForBook(burnedTome), - ModItems.glass_shard, - Items.writable_book, - new ItemStack( - WayofTime.alchemicalWizardry.ModItems.apprenticeBloodOrb, 1, OreDictionary.WILDCARD_VALUE))); + GameRegistry.addRecipe( + new ShapelessBloodOrbRecipe( + GuideRegistry.getItemStackForBook(burnedTome), + ModItems.glass_shard, + Items.writable_book, + new ItemStack( + WayofTime.alchemicalWizardry.ModItems.apprenticeBloodOrb, + 1, + OreDictionary.WILDCARD_VALUE))); RecipeHolder.init(); } @@ -66,13 +70,17 @@ public class BloodBurnedTome { makePage(lifeBringerEntries, glass, "glass"); } - categories.add(new CategoryItemStack( - lifeBringerEntries, "guide.bloodarsenal.category.lifeBringer", new ItemStack(ModItems.bound_bow))); + categories.add( + new CategoryItemStack( + lifeBringerEntries, + "guide.bloodarsenal.category.lifeBringer", + new ItemStack(ModItems.bound_bow))); } private static void makePage(List entries, ArrayList pages, String name, Object... others) { - pages.addAll(PageHelper.pagesForLongText( - replaceColors(StatCollector.translateToLocal("guide.bloodarsenal.entry." + name)))); + pages.addAll( + PageHelper.pagesForLongText( + replaceColors(StatCollector.translateToLocal("guide.bloodarsenal.entry." + name)))); if (others != null) { for (Object code : others) { @@ -93,7 +101,8 @@ public class BloodBurnedTome { private static Object[] s(String pageName) { if (pageName != null) { - return PageHelper.pagesForLongText( + return PageHelper + .pagesForLongText( replaceColors(StatCollector.translateToLocal("guide.bloodarsenal.entry." + pageName))) .toArray(); } @@ -117,10 +126,11 @@ public class BloodBurnedTome { if (names != null) { ArrayList images = new ArrayList(); for (String name : names) { - images.add(new PageUnlocImage( - replaceColors(StatCollector.translateToLocal("guide.bloodarsenal.caption." + name)), - new ResourceLocation(R_LOC + name + ".png"), - true)); + images.add( + new PageUnlocImage( + replaceColors(StatCollector.translateToLocal("guide.bloodarsenal.caption." + name)), + new ResourceLocation(R_LOC + name + ".png"), + true)); } return images.toArray(); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/book/RecipeHolder.java b/src/main/java/com/arc/bloodarsenal/common/items/book/RecipeHolder.java index 9ed0f6b..69c75fe 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/book/RecipeHolder.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/book/RecipeHolder.java @@ -1,13 +1,16 @@ package com.arc.bloodarsenal.common.items.book; -import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipe; -import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; +import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipe; +import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; + public class RecipeHolder { + private static List recipeList; public static IRecipe glassSacrificialDagger; diff --git a/src/main/java/com/arc/bloodarsenal/common/items/orb/TransparentOrb.java b/src/main/java/com/arc/bloodarsenal/common/items/orb/TransparentOrb.java index 6475e9f..35a8089 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/orb/TransparentOrb.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/orb/TransparentOrb.java @@ -1,10 +1,7 @@ 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; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -13,7 +10,13 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import WayofTime.alchemicalWizardry.common.items.EnergyBattery; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class TransparentOrb extends EnergyBattery { + IIcon icons[] = new IIcon[45]; public TransparentOrb(int damage) { @@ -26,10 +29,12 @@ public class TransparentOrb extends EnergyBattery { list.add(StatCollector.translateToLocal("tooltip.energybattery.desc")); if (itemStack.getTagCompound() != null) { - list.add(StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + itemStack.getTagCompound().getString("ownerName")); - list.add(StatCollector.translateToLocal("tooltip.energybattery.currentLP") + " " - + this.getCurrentEssence(itemStack)); + list.add( + StatCollector.translateToLocal("tooltip.owner.currentowner") + " " + + itemStack.getTagCompound().getString("ownerName")); + list.add( + StatCollector.translateToLocal("tooltip.energybattery.currentLP") + " " + + this.getCurrentEssence(itemStack)); } } @@ -39,8 +44,8 @@ public class TransparentOrb extends EnergyBattery { return; } - int maxEssence = SoulNetworkHandler.getMaximumForOrbTier( - SoulNetworkHandler.getCurrentMaxOrb(SoulNetworkHandler.getOwnerName(itemStack))); + int maxEssence = SoulNetworkHandler + .getMaximumForOrbTier(SoulNetworkHandler.getCurrentMaxOrb(SoulNetworkHandler.getOwnerName(itemStack))); int section = maxEssence / 44; int currentEssence = SoulNetworkHandler.getCurrentEssence(SoulNetworkHandler.getOwnerName(itemStack)); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilDivinity.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilDivinity.java index 0581c9a..56bec5d 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilDivinity.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilDivinity.java @@ -1,13 +1,7 @@ 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.common.BloodArsenalConfig; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -19,7 +13,18 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +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.common.BloodArsenalConfig; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class SigilDivinity extends EnergyItems implements ArmourUpgrade, IBindable, ISigil { + @SideOnly(Side.CLIENT) public IIcon activeIcon; diff --git a/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilEnder.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilEnder.java index b9b51d1..2534711 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilEnder.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilEnder.java @@ -1,11 +1,7 @@ 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.common.BloodArsenalConfig; import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -14,7 +10,15 @@ import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; import net.minecraft.world.World; +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.common.BloodArsenalConfig; + public class SigilEnder extends EnergyItems implements IBindable, ISigil { + public SigilEnder() { super(); setMaxStackSize(1); @@ -79,9 +83,8 @@ public class SigilEnder extends EnergyItems implements IBindable, ISigil { Vec3 vec3 = Vec3.createVectorHelper(ex, wy, zee); double distance = playerPrevPos.distanceTo(vec3); - if (SoulNetworkHandler.getCurrentEssence( - itemStack.getTagCompound().getString("ownerName")) - >= distance * BloodArsenalConfig.enderSigilTeleportMultiplier + if (SoulNetworkHandler.getCurrentEssence(itemStack.getTagCompound().getString("ownerName")) + >= distance * BloodArsenalConfig.enderSigilTeleportMultiplier || player.capabilities.isCreativeMode) { for (int k = 0; k < 8; ++k) { world.spawnParticle( @@ -104,7 +107,9 @@ public class SigilEnder extends EnergyItems implements IBindable, ISigil { player.setPositionAndUpdate(ex, wy, zee); EnergyItems.syphonBatteries( - itemStack, player, (int) distance * BloodArsenalConfig.enderSigilTeleportMultiplier); + itemStack, + player, + (int) distance * BloodArsenalConfig.enderSigilTeleportMultiplier); world.playSoundAtEntity(player, "mob.endermen.portal", 1F, 1F); player.swingItem(); player.setVelocity(0.0D, 0.0D, 0.0D); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilLightning.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilLightning.java index 0461d04..ba408e1 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilLightning.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilLightning.java @@ -1,11 +1,7 @@ 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.common.BloodArsenalConfig; import java.util.List; + import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -16,7 +12,15 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +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.common.BloodArsenalConfig; + public class SigilLightning extends EnergyItems implements IBindable, ISigil { + public SigilLightning() { super(); setMaxStackSize(1); @@ -94,7 +98,7 @@ public class SigilLightning extends EnergyItems implements IBindable, ISigil { int cost = 0; switch (mode) { - // 8 per lightning bolt + // 8 per lightning bolt case 0: cost = 8 * BloodArsenalConfig.lightningSigilMultiplier; break; @@ -112,9 +116,7 @@ public class SigilLightning extends EnergyItems implements IBindable, ISigil { break; } - if (SoulNetworkHandler.getCurrentEssence( - itemStack.getTagCompound().getString("ownerName")) - >= cost + if (SoulNetworkHandler.getCurrentEssence(itemStack.getTagCompound().getString("ownerName")) >= cost || player.capabilities.isCreativeMode) { switch (mode) { case 0: diff --git a/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilSwimming.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilSwimming.java index 2b01cc0..39072a8 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilSwimming.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilSwimming.java @@ -1,13 +1,7 @@ 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.common.BloodArsenalConfig; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -18,7 +12,18 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +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.common.BloodArsenalConfig; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class SigilSwimming extends EnergyItems implements ArmourUpgrade, IBindable, ISigil { + @SideOnly(Side.CLIENT) private static IIcon activeIcon; diff --git a/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilUtils.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilUtils.java index d2bfa3c..d3ac3e6 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilUtils.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilUtils.java @@ -1,11 +1,5 @@ package com.arc.bloodarsenal.common.items.sigil; -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; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.entity.player.EntityPlayer; @@ -17,9 +11,18 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.client.event.MouseEvent; +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; + public class SigilUtils { - public static MovingObjectPosition getTargetBlock( - World world, double x, double y, double z, float yaw, float pitch, boolean par3, double range) { + + public static MovingObjectPosition getTargetBlock(World world, double x, double y, double z, float yaw, float pitch, + boolean par3, double range) { Vec3 var13 = Vec3.createVectorHelper(x, y, z); float var14 = MathHelper.cos(-yaw * 0.01745329F - 3.141593F); float var15 = MathHelper.sin(-yaw * 0.01745329F - 3.141593F); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/AHPacketHandler.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/AHPacketHandler.java index 583ddf6..a7f74a9 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/AHPacketHandler.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/AHPacketHandler.java @@ -5,6 +5,7 @@ import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; public class AHPacketHandler { + public static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel("AugmentedHolding"); public static void init() { diff --git a/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/AHPacketProcessor.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/AHPacketProcessor.java index 22a327a..7d8cf78 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/AHPacketProcessor.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/AHPacketProcessor.java @@ -1,12 +1,14 @@ package com.arc.bloodarsenal.common.items.sigil.holding; +import net.minecraft.item.ItemStack; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; -import net.minecraft.item.ItemStack; public class AHPacketProcessor implements IMessage, IMessageHandler { + private int slot; private int mode; diff --git a/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/ContainerAugmentedHolding.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/ContainerAugmentedHolding.java index 1e92c85..ee1b60b 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/ContainerAugmentedHolding.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/ContainerAugmentedHolding.java @@ -1,14 +1,16 @@ package com.arc.bloodarsenal.common.items.sigil.holding; -import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; -import cpw.mods.fml.common.FMLCommonHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; +import cpw.mods.fml.common.FMLCommonHandler; + public class ContainerAugmentedHolding extends Container { + protected final int PLAYER_INVENTORY_ROWS = 3; protected final int PLAYER_INVENTORY_COLUMNS = 9; @@ -29,8 +31,12 @@ public class ContainerAugmentedHolding extends Container { for (int rowIndex = 0; rowIndex < PLAYER_INVENTORY_ROWS; ++rowIndex) { for (int columnIndex = 0; columnIndex < PLAYER_INVENTORY_COLUMNS; ++columnIndex) { - this.addSlotToContainer(new Slot( - player.inventory, columnIndex + rowIndex * 9 + 9, 8 + columnIndex * 18, 39 + rowIndex * 18)); + this.addSlotToContainer( + new Slot( + player.inventory, + columnIndex + rowIndex * 9 + 9, + 8 + columnIndex * 18, + 39 + rowIndex * 18)); } } @@ -99,8 +105,8 @@ public class ContainerAugmentedHolding extends Container { inventoryColumns, inventoryColumns + (PLAYER_INVENTORY_ROWS * PLAYER_INVENTORY_COLUMNS), false)) { - return null; - } + return null; + } } if (stackInSlot.stackSize == 0) { @@ -124,16 +130,12 @@ public class ContainerAugmentedHolding extends Container { } private class SlotHolding extends Slot { + private final EntityPlayer player; private ContainerAugmentedHolding containerHolding; - public SlotHolding( - ContainerAugmentedHolding containerHolding, - IInventory inventory, - EntityPlayer player, - int slotIndex, - int x, - int y) { + public SlotHolding(ContainerAugmentedHolding containerHolding, IInventory inventory, EntityPlayer player, + int slotIndex, int x, int y) { super(inventory, slotIndex, x, y); this.player = player; this.containerHolding = containerHolding; @@ -155,6 +157,7 @@ public class ContainerAugmentedHolding extends Container { } private class SlotDisabled extends Slot { + public SlotDisabled(IInventory inventory, int slotIndex, int x, int y) { super(inventory, slotIndex, x, y); } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/GuiAugmentedHolding.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/GuiAugmentedHolding.java index d5483c3..5eb5e97 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/GuiAugmentedHolding.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/GuiAugmentedHolding.java @@ -1,14 +1,17 @@ package com.arc.bloodarsenal.common.items.sigil.holding; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiAugmentedHolding extends GuiContainer { + public GuiAugmentedHolding(EntityPlayer player, InventoryAugmentedHolding inventoryHolding) { super(new ContainerAugmentedHolding(player, inventoryHolding)); xSize = 176; diff --git a/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/InventoryAugmentedHolding.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/InventoryAugmentedHolding.java index 6644fe2..6e8fa94 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/InventoryAugmentedHolding.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/InventoryAugmentedHolding.java @@ -1,14 +1,17 @@ package com.arc.bloodarsenal.common.items.sigil.holding; -import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import java.util.UUID; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; + public class InventoryAugmentedHolding implements IInventory { + public ItemStack parentItemStack; protected ItemStack[] inventory; diff --git a/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/SigilAugmentedHolding.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/SigilAugmentedHolding.java index 89775a5..751da9e 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/SigilAugmentedHolding.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/SigilAugmentedHolding.java @@ -1,8 +1,7 @@ package com.arc.bloodarsenal.common.items.sigil.holding; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; import java.util.List; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,7 +12,12 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +import com.arc.bloodarsenal.common.BloodArsenal; + public class SigilAugmentedHolding extends EnergyItems { + private static int invSize = 8; private static final String NBT_CURRENT_SIGIL = "CurrentSigil"; @@ -47,8 +51,9 @@ public class SigilAugmentedHolding extends EnergyItems { par3List.add(StatCollector.translateToLocal("tooltip.sigil.augmentedHolding")); if (!(par1ItemStack.getTagCompound() == null)) { - par3List.add(StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); + par3List.add( + StatCollector.translateToLocal("tooltip.owner.currentowner") + " " + + par1ItemStack.getTagCompound().getString("ownerName")); ItemStack[] inv = getInternalInventory(par1ItemStack); if (inv == null) { @@ -64,25 +69,19 @@ public class SigilAugmentedHolding extends EnergyItems { for (int i = 0; i <= invSize; i++) { if (inv[i] != null) { - par3List.add(StatCollector.translateToLocal("tooltip.item.iteminslot") + " " + (i + 1) + ": " - + inv[i].getDisplayName()); + par3List.add( + StatCollector.translateToLocal("tooltip.item.iteminslot") + " " + + (i + 1) + + ": " + + inv[i].getDisplayName()); } } } } @Override - public boolean onItemUse( - ItemStack par1ItemStack, - EntityPlayer par2EntityPlayer, - World par3World, - int par4, - int par5, - int par6, - int par7, - float par8, - float par9, - float par10) { + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, + int par5, int par6, int par7, float par8, float par9, float par10) { if (checkAndSetItemOwner(par1ItemStack, par2EntityPlayer)) { int currentSlot = getCurrentItem(par1ItemStack); ItemStack[] inv = getInternalInventory(par1ItemStack); @@ -255,8 +254,8 @@ public class SigilAugmentedHolding extends EnergyItems { } } - public void tickInternalInventory( - ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { + public void tickInternalInventory(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, + boolean par5) { ItemStack[] inv = getInternalInventory(par1ItemStack); if (inv == null) { diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundBow.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundBow.java index 491611b..acb7ddf 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundBow.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundBow.java @@ -1,11 +1,7 @@ package com.arc.bloodarsenal.common.items.tool; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; @@ -24,7 +20,16 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.event.entity.player.ArrowNockEvent; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +import com.arc.bloodarsenal.common.BloodArsenal; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BoundBow extends ItemBow implements IBindable { + @SideOnly(Side.CLIENT) private IIcon active; @@ -65,8 +70,8 @@ public class BoundBow extends ItemBow implements IBindable { } @Override - public void onPlayerStoppedUsing( - ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, int par4) { + public void onPlayerStoppedUsing(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, + int par4) { int j = getMaxItemUseDuration(par1ItemStack) - par4; ArrowLooseEvent event = new ArrowLooseEvent(par3EntityPlayer, par1ItemStack, j); @@ -115,7 +120,10 @@ public class BoundBow extends ItemBow implements IBindable { par1ItemStack.damageItem(1, par3EntityPlayer); par2World.playSoundAtEntity( - par3EntityPlayer, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); + par3EntityPlayer, + "random.bow", + 1.0F, + 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); if (flag) { entityarrow.canBePickedUp = 2; diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundIgniter.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundIgniter.java index 11260d0..d46ed45 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundIgniter.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundIgniter.java @@ -1,11 +1,7 @@ package com.arc.bloodarsenal.common.items.tool; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -18,7 +14,16 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +import com.arc.bloodarsenal.common.BloodArsenal; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BoundIgniter extends Item implements IBindable { + private int energyUsed; @SideOnly(Side.CLIENT) @@ -75,17 +80,8 @@ public class BoundIgniter extends Item implements IBindable { return par1ItemStack; } - public boolean onItemUse( - ItemStack itemStack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int hitSide, - float hitX, - float hitY, - float hitZ) { + public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int hitSide, + float hitX, float hitY, float hitZ) { NBTTagCompound tag = itemStack.stackTagCompound; if (tag.getBoolean("isActive")) { diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundShears.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundShears.java index e663da7..62016e7 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundShears.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundShears.java @@ -1,14 +1,9 @@ package com.arc.bloodarsenal.common.items.tool; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; -import com.arc.bloodarsenal.common.entity.mob.EntityBloodHound; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -28,7 +23,17 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.entity.mob.EntityBloodHound; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BoundShears extends ItemShears implements IBindable { + private int energyUsed; @SideOnly(Side.CLIENT) @@ -53,14 +58,8 @@ public class BoundShears extends ItemShears implements IBindable { return energyUsed; } - public boolean onBlockDestroyed( - ItemStack par1ItemStack, - World par2World, - Block par3Block, - int par4, - int par5, - int par6, - EntityLivingBase par7EntityLivingBase) { + public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, Block par3Block, int par4, int par5, + int par6, EntityLivingBase par7EntityLivingBase) { if (!(par7EntityLivingBase instanceof EntityPlayer)) return false; EntityPlayer player = (EntityPlayer) par7EntityLivingBase; @@ -68,8 +67,7 @@ public class BoundShears extends ItemShears implements IBindable { EnergyItems.syphonBatteries(par1ItemStack, player, 50); } - if (par3Block.getMaterial() != Material.leaves - && par3Block != Blocks.web + if (par3Block.getMaterial() != Material.leaves && par3Block != Blocks.web && par3Block != Blocks.tallgrass && par3Block != Blocks.vine && par3Block != Blocks.tripwire @@ -105,7 +103,11 @@ public class BoundShears extends ItemShears implements IBindable { if (entity instanceof IShearable) { IShearable target = (IShearable) entity; if (target.isShearable( - itemstack, entity.worldObj, (int) entity.posX, (int) entity.posY, (int) entity.posZ)) { + itemstack, + entity.worldObj, + (int) entity.posX, + (int) entity.posY, + (int) entity.posZ)) { ArrayList drops = target.onSheared( itemstack, entity.worldObj, @@ -155,7 +157,11 @@ public class BoundShears extends ItemShears implements IBindable { double d1 = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; double d2 = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; EntityItem entityitem = new EntityItem( - player.worldObj, (double) x + d, (double) y + d1, (double) z + d2, stack); + player.worldObj, + (double) x + d, + (double) y + d1, + (double) z + d2, + stack); entityitem.delayBeforeCanPickup = 10; player.worldObj.spawnEntityInWorld(entityitem); } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundSickle.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundSickle.java index 46e8313..d2c9e1b 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundSickle.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundSickle.java @@ -1,14 +1,8 @@ package com.arc.bloodarsenal.common.items.tool; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; -import com.google.common.collect.Sets; -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Set; + import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.client.renderer.texture.IIconRegister; @@ -25,7 +19,18 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.UseHoeEvent; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +import com.arc.bloodarsenal.common.BloodArsenal; +import com.google.common.collect.Sets; + +import cpw.mods.fml.common.eventhandler.Event; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BoundSickle extends ItemTool implements IBindable { + private int energyUsed; private int radiusLeaf = 3; @@ -34,22 +39,10 @@ public class BoundSickle extends ItemTool implements IBindable { private static IIcon active; private static IIcon passive; - private static final Set toolBlocks = Sets.newHashSet(new Block[] { - Blocks.leaves, - Blocks.leaves2, - Blocks.wheat, - Blocks.potatoes, - Blocks.carrots, - Blocks.nether_wart, - Blocks.red_mushroom, - Blocks.brown_mushroom, - Blocks.reeds, - Blocks.tallgrass, - Blocks.vine, - Blocks.waterlily, - Blocks.red_flower, - Blocks.yellow_flower - }); + private static final Set toolBlocks = Sets.newHashSet( + new Block[] { Blocks.leaves, Blocks.leaves2, Blocks.wheat, Blocks.potatoes, Blocks.carrots, + Blocks.nether_wart, Blocks.red_mushroom, Blocks.brown_mushroom, Blocks.reeds, Blocks.tallgrass, + Blocks.vine, Blocks.waterlily, Blocks.red_flower, Blocks.yellow_flower }); public BoundSickle(ToolMaterial toolMaterial) { super(1.0F, toolMaterial, toolBlocks); @@ -69,13 +62,7 @@ public class BoundSickle extends ItemTool implements IBindable { return energyUsed; } - public boolean onBlockDestroyed( - ItemStack par1ItemStack, - World par2World, - Block par3Block, - int x, - int y, - int z, + public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, Block par3Block, int x, int y, int z, EntityLivingBase par7EntityLivingBase) { NBTTagCompound tag = par1ItemStack.stackTagCompound; @@ -149,17 +136,8 @@ public class BoundSickle extends ItemTool implements IBindable { } } - public boolean onItemUse( - ItemStack par1ItemStack, - EntityPlayer par2EntityPlayer, - World par3World, - int x, - int y, - int z, - int par7, - float par8, - float par9, - float par10) { + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int x, int y, + int z, int par7, float par8, float par9, float par10) { NBTTagCompound tag = par1ItemStack.stackTagCompound; if (tag.getBoolean("isActive")) { @@ -181,8 +159,7 @@ public class BoundSickle extends ItemTool implements IBindable { Block block = par3World.getBlock(x, y, z); - if (par7 != 0 - && par3World.getBlock(x, y + 1, z).isAir(par3World, x, y + 1, z) + if (par7 != 0 && par3World.getBlock(x, y + 1, z).isAir(par3World, x, y + 1, z) && (block == Blocks.grass || block == Blocks.dirt)) { Block block1 = Blocks.farmland; par3World.playSoundEffect( diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/GlassDaggerOfSacrifice.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/GlassDaggerOfSacrifice.java index d3b19f0..a365daa 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/GlassDaggerOfSacrifice.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/GlassDaggerOfSacrifice.java @@ -1,15 +1,8 @@ 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.common.BloodArsenal; -import com.arc.bloodarsenal.common.BloodArsenalConfig; -import com.google.common.collect.Multimap; import java.util.List; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -28,7 +21,18 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +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.common.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenalConfig; +import com.google.common.collect.Multimap; + public class GlassDaggerOfSacrifice extends EnergyItems { + private float weaponDamage; public GlassDaggerOfSacrifice() { @@ -41,14 +45,12 @@ public class GlassDaggerOfSacrifice extends EnergyItems { } @Override - public boolean hitEntity( - ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { - if (par3EntityLivingBase == null - || par2EntityLivingBase == null + public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, + EntityLivingBase par3EntityLivingBase) { + if (par3EntityLivingBase == null || par2EntityLivingBase == null || par3EntityLivingBase.worldObj.isRemote - || (par3EntityLivingBase instanceof EntityPlayer - && SpellHelper.isFakePlayer( - par3EntityLivingBase.worldObj, (EntityPlayer) par3EntityLivingBase))) { + || (par3EntityLivingBase instanceof EntityPlayer && SpellHelper + .isFakePlayer(par3EntityLivingBase.worldObj, (EntityPlayer) par3EntityLivingBase))) { return false; } @@ -56,8 +58,7 @@ public class GlassDaggerOfSacrifice extends EnergyItems { return false; } - if (par2EntityLivingBase.isChild() - || par2EntityLivingBase instanceof EntityPlayer + if (par2EntityLivingBase.isChild() || par2EntityLivingBase instanceof EntityPlayer || par2EntityLivingBase instanceof IBossDisplayData) { return false; } @@ -89,7 +90,16 @@ public class GlassDaggerOfSacrifice extends EnergyItems { for (int i = 0; i < 8; i++) { SpellHelper.sendIndexedParticleToAllAround( - world, posX, posY, posZ, 20, world.provider.dimensionId, 1, posX, posY, posZ); + world, + posX, + posY, + posZ, + 20, + world.provider.dimensionId, + 1, + posX, + posY, + posZ); } par2EntityLivingBase.setHealth(-1); @@ -114,13 +124,10 @@ public class GlassDaggerOfSacrifice extends EnergyItems { return 15.0F; } else { Material material = par2Block.getMaterial(); - return material != Material.plants - && material != Material.vine - && material != Material.coral - && material != Material.leaves - && material != Material.gourd - ? 1.0F - : 1.5F; + return material != Material.plants && material != Material.vine + && material != Material.coral + && material != Material.leaves + && material != Material.gourd ? 1.0F : 1.5F; } } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/GlassSacrificialDagger.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/GlassSacrificialDagger.java index 5530ff1..596c69f 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/GlassSacrificialDagger.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/GlassSacrificialDagger.java @@ -1,16 +1,8 @@ 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.common.BloodArsenal; -import com.arc.bloodarsenal.common.BloodArsenalConfig; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Random; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -24,7 +16,20 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; +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.common.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenalConfig; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class GlassSacrificialDagger extends Item { + public GlassSacrificialDagger() { super(); setMaxStackSize(1); 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 index 4db5e40..5dd8f7b 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/IFillable.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/IFillable.java @@ -3,6 +3,7 @@ package com.arc.bloodarsenal.common.items.tool; import net.minecraft.item.ItemStack; public interface IFillable { + int getMaxLP(); int getLPStored(ItemStack container); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamond.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamond.java index 404776b..d1f6fa0 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamond.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamond.java @@ -1,10 +1,7 @@ package com.arc.bloodarsenal.common.items.tool; -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 java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -12,7 +9,14 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +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; + public class InfusedDiamond extends Item { + public InfusedDiamond() { super(); setMaxStackSize(1); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondAxe.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondAxe.java index 43688c3..5913214 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondAxe.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondAxe.java @@ -1,12 +1,8 @@ package com.arc.bloodarsenal.common.items.tool; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; @@ -21,7 +17,16 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +import com.arc.bloodarsenal.common.BloodArsenal; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class InfusedDiamondAxe extends ItemAxe implements IBindable { + public static ArrayList oreDictLogs = new ArrayList(); public InfusedDiamondAxe() { @@ -125,7 +130,8 @@ public class InfusedDiamondAxe extends ItemAxe implements IBindable { } List items = world.getEntitiesWithinAABB( - EntityItem.class, AxisAlignedBB.getBoundingBox(x - 5, y - 1, z - 5, x + 5, y + 64, z + 5)); + EntityItem.class, + AxisAlignedBB.getBoundingBox(x - 5, y - 1, z - 5, x + 5, y + 64, z + 5)); for (EntityItem item : items) { item.setPosition(x + 0.5, y + 0.5, z + 0.5); item.ticksExisted += 20; diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondPickaxe.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondPickaxe.java index 3ce499a..49cf6a1 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondPickaxe.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondPickaxe.java @@ -1,11 +1,7 @@ package com.arc.bloodarsenal.common.items.tool; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -18,7 +14,16 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +import com.arc.bloodarsenal.common.BloodArsenal; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class InfusedDiamondPickaxe extends ItemPickaxe implements IBindable { + private int energyUsed; public InfusedDiamondPickaxe() { @@ -71,14 +76,8 @@ public class InfusedDiamondPickaxe extends ItemPickaxe implements IBindable { } @Override - public boolean onBlockDestroyed( - ItemStack par1ItemStack, - World par2World, - Block par3Block, - int par4, - int par5, - int par6, - EntityLivingBase par7EntityLivingBase) { + public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, Block par3Block, int par4, int par5, + int par6, EntityLivingBase par7EntityLivingBase) { if (par7EntityLivingBase instanceof EntityPlayer) { EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par7EntityLivingBase, getEnergyUsed()); } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondShovel.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondShovel.java index ab9088f..0bcfc8b 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondShovel.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondShovel.java @@ -1,11 +1,7 @@ package com.arc.bloodarsenal.common.items.tool; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -16,7 +12,16 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +import com.arc.bloodarsenal.common.BloodArsenal; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class InfusedDiamondShovel extends ItemSpade implements IBindable { + public InfusedDiamondShovel() { super(BloodArsenal.infusedIron); setMaxStackSize(1); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondSword.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondSword.java index df2f5e0..33806b7 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondSword.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondSword.java @@ -1,11 +1,7 @@ package com.arc.bloodarsenal.common.items.tool; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -18,7 +14,16 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +import com.arc.bloodarsenal.common.BloodArsenal; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class InfusedDiamondSword extends ItemSword implements IBindable { + public InfusedDiamondSword() { super(BloodArsenal.infusedDiamond); setMaxStackSize(1); @@ -52,8 +57,7 @@ public class InfusedDiamondSword extends ItemSword implements IBindable { @Override public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { - if (!ignoreLeftClick - && entity instanceof EntityLivingBase + if (!ignoreLeftClick && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).hurtTime == 0 && !((EntityLivingBase) entity).isDead) { switch (ToolCapabilities.getMode(stack)) { @@ -102,8 +106,8 @@ public class InfusedDiamondSword extends ItemSword implements IBindable { } @Override - public boolean hitEntity( - ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { + public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, + EntityLivingBase par3EntityLivingBase) { if (par3EntityLivingBase instanceof EntityPlayer) { EnergyItems.checkAndSetItemOwner(par1ItemStack, (EntityPlayer) par3EntityLivingBase); } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronAxe.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronAxe.java index f20bb1f..ae892e7 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronAxe.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronAxe.java @@ -1,11 +1,7 @@ package com.arc.bloodarsenal.common.items.tool; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -14,7 +10,16 @@ import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +import com.arc.bloodarsenal.common.BloodArsenal; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class InfusedIronAxe extends ItemAxe implements IBindable { + private int energyUsed; public InfusedIronAxe() { @@ -52,14 +57,8 @@ public class InfusedIronAxe extends ItemAxe implements IBindable { } @Override - public boolean onBlockDestroyed( - ItemStack par1ItemStack, - World par2World, - Block par3Block, - int par4, - int par5, - int par6, - EntityLivingBase par7EntityLivingBase) { + public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, Block par3Block, int par4, int par5, + int par6, EntityLivingBase par7EntityLivingBase) { if (par7EntityLivingBase instanceof EntityPlayer) { EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par7EntityLivingBase, getEnergyUsed()); } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronPickaxe.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronPickaxe.java index af578b9..4097cf6 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronPickaxe.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronPickaxe.java @@ -1,11 +1,7 @@ package com.arc.bloodarsenal.common.items.tool; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -14,7 +10,16 @@ import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +import com.arc.bloodarsenal.common.BloodArsenal; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class InfusedIronPickaxe extends ItemPickaxe implements IBindable { + private int energyUsed; public InfusedIronPickaxe() { @@ -52,14 +57,8 @@ public class InfusedIronPickaxe extends ItemPickaxe implements IBindable { } @Override - public boolean onBlockDestroyed( - ItemStack par1ItemStack, - World par2World, - Block par3Block, - int par4, - int par5, - int par6, - EntityLivingBase par7EntityLivingBase) { + public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, Block par3Block, int par4, int par5, + int par6, EntityLivingBase par7EntityLivingBase) { if (par7EntityLivingBase instanceof EntityPlayer) { EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par7EntityLivingBase, getEnergyUsed()); } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronShovel.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronShovel.java index cc2f99c..eb7b224 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronShovel.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronShovel.java @@ -1,11 +1,7 @@ package com.arc.bloodarsenal.common.items.tool; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -14,7 +10,16 @@ import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +import com.arc.bloodarsenal.common.BloodArsenal; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class InfusedIronShovel extends ItemSpade implements IBindable { + private int energyUsed; public InfusedIronShovel() { @@ -52,14 +57,8 @@ public class InfusedIronShovel extends ItemSpade implements IBindable { } @Override - public boolean onBlockDestroyed( - ItemStack par1ItemStack, - World par2World, - Block par3Block, - int par4, - int par5, - int par6, - EntityLivingBase par7EntityLivingBase) { + public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, Block par3Block, int par4, int par5, + int par6, EntityLivingBase par7EntityLivingBase) { if (par7EntityLivingBase instanceof EntityPlayer) { EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par7EntityLivingBase, getEnergyUsed()); } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronSword.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronSword.java index 82140ff..f96c187 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronSword.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronSword.java @@ -1,11 +1,7 @@ package com.arc.bloodarsenal.common.items.tool; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -13,7 +9,16 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +import com.arc.bloodarsenal.common.BloodArsenal; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class InfusedIronSword extends ItemSword implements IBindable { + private int energyUsed; public InfusedIronSword() { @@ -44,8 +49,8 @@ public class InfusedIronSword extends ItemSword implements IBindable { } @Override - public boolean hitEntity( - ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { + public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, + EntityLivingBase par3EntityLivingBase) { if (par3EntityLivingBase instanceof EntityPlayer) { EnergyItems.checkAndSetItemOwner(par1ItemStack, (EntityPlayer) par3EntityLivingBase); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodAxe.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodAxe.java index d9f4998..acf47bd 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodAxe.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodAxe.java @@ -1,11 +1,7 @@ package com.arc.bloodarsenal.common.items.tool; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -13,7 +9,16 @@ import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +import com.arc.bloodarsenal.common.BloodArsenal; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class InfusedWoodAxe extends ItemAxe implements IBindable { + private int energyUsed; public InfusedWoodAxe() { @@ -51,14 +56,8 @@ public class InfusedWoodAxe extends ItemAxe implements IBindable { } @Override - public boolean onBlockDestroyed( - ItemStack par1ItemStack, - World par2World, - Block par3Block, - int par4, - int par5, - int par6, - EntityLivingBase par7EntityLivingBase) { + public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, Block par3Block, int par4, int par5, + int par6, EntityLivingBase par7EntityLivingBase) { if (par7EntityLivingBase instanceof EntityPlayer) { EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par7EntityLivingBase, getEnergyUsed()); } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodPickaxe.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodPickaxe.java index e417f39..5d0a168 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodPickaxe.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodPickaxe.java @@ -1,11 +1,7 @@ package com.arc.bloodarsenal.common.items.tool; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -13,7 +9,16 @@ import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +import com.arc.bloodarsenal.common.BloodArsenal; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class InfusedWoodPickaxe extends ItemPickaxe implements IBindable { + private int energyUsed; public InfusedWoodPickaxe() { @@ -51,14 +56,8 @@ public class InfusedWoodPickaxe extends ItemPickaxe implements IBindable { } @Override - public boolean onBlockDestroyed( - ItemStack par1ItemStack, - World par2World, - Block par3Block, - int par4, - int par5, - int par6, - EntityLivingBase par7EntityLivingBase) { + public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, Block par3Block, int par4, int par5, + int par6, EntityLivingBase par7EntityLivingBase) { if (par7EntityLivingBase instanceof EntityPlayer) { EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par7EntityLivingBase, getEnergyUsed()); } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodShovel.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodShovel.java index 264bde1..95b4019 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodShovel.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodShovel.java @@ -1,11 +1,7 @@ package com.arc.bloodarsenal.common.items.tool; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -13,7 +9,16 @@ import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +import com.arc.bloodarsenal.common.BloodArsenal; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class InfusedWoodShovel extends ItemSpade implements IBindable { + private int energyUsed; public InfusedWoodShovel() { @@ -51,14 +56,8 @@ public class InfusedWoodShovel extends ItemSpade implements IBindable { } @Override - public boolean onBlockDestroyed( - ItemStack par1ItemStack, - World par2World, - Block par3Block, - int par4, - int par5, - int par6, - EntityLivingBase par7EntityLivingBase) { + public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, Block par3Block, int par4, int par5, + int par6, EntityLivingBase par7EntityLivingBase) { if (par7EntityLivingBase instanceof EntityPlayer) { EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par7EntityLivingBase, getEnergyUsed()); } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodSword.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodSword.java index a2140a5..fe56901 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodSword.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodSword.java @@ -1,18 +1,23 @@ package com.arc.bloodarsenal.common.items.tool; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +import com.arc.bloodarsenal.common.BloodArsenal; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class InfusedWoodSword extends ItemSword implements IBindable { + private int energyUsed; public InfusedWoodSword() { @@ -43,8 +48,8 @@ public class InfusedWoodSword extends ItemSword implements IBindable { } @Override - public boolean hitEntity( - ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { + public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, + EntityLivingBase par3EntityLivingBase) { if (par3EntityLivingBase instanceof EntityPlayer) { EnergyItems.checkAndSetItemOwner(par1ItemStack, (EntityPlayer) par3EntityLivingBase); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/ToolCapabilities.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/ToolCapabilities.java index 0bd5dd7..e211007 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/ToolCapabilities.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/ToolCapabilities.java @@ -1,6 +1,7 @@ package com.arc.bloodarsenal.common.items.tool; import java.util.Arrays; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; @@ -15,14 +16,13 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; public final class ToolCapabilities { - public static Material[] materialsPick = - new Material[] {Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil - }; - public static Material[] materialsShovel = new Material[] { - Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay - }; - public static Material[] materialsAxe = - new Material[] {Material.coral, Material.leaves, Material.plants, Material.wood}; + + public static Material[] materialsPick = new Material[] { Material.rock, Material.iron, Material.ice, + Material.glass, Material.piston, Material.anvil }; + public static Material[] materialsShovel = new Material[] { Material.grass, Material.ground, Material.sand, + Material.snow, Material.craftedSnow, Material.clay }; + public static Material[] materialsAxe = new Material[] { Material.coral, Material.leaves, Material.plants, + Material.wood }; public static int getMode(ItemStack tool) { return tool.getItemDamage(); @@ -46,43 +46,31 @@ public final class ToolCapabilities { return false; } - public static void removeBlocksInIteration( - EntityPlayer player, - World world, - int x, - int y, - int z, - int xs, - int ys, - int zs, - int xe, - int ye, - int ze, - Block block, - Material[] materialsListing) { + public static void removeBlocksInIteration(EntityPlayer player, World world, int x, int y, int z, int xs, int ys, + int zs, int xe, int ye, int ze, Block block, Material[] materialsListing) { float blockHardness = (block == null) ? 1.0f : block.getBlockHardness(world, x, y, z); for (int x1 = xs; x1 < xe; x1++) { for (int y1 = ys; y1 < ye; y1++) { for (int z1 = zs; z1 < ze; z1++) { ToolCapabilities.removeBlockWithDrops( - player, world, x1 + x, y1 + y, z1 + z, x, y, z, block, materialsListing); + player, + world, + x1 + x, + y1 + y, + z1 + z, + x, + y, + z, + block, + materialsListing); } } } } - public static void removeBlockWithDrops( - EntityPlayer player, - World world, - int x, - int y, - int z, - int bx, - int by, - int bz, - Block block, - Material[] materialsListing) { + public static void removeBlockWithDrops(EntityPlayer player, World world, int x, int y, int z, int bx, int by, + int bz, Block block, Material[] materialsListing) { if (!world.blockExists(x, y, z)) { return; } @@ -96,8 +84,7 @@ public final class ToolCapabilities { int meta = world.getBlockMetadata(x, y, z); Material mat = world.getBlock(x, y, z).getMaterial(); - if (blk != null - && !blk.isAir(world, x, y, z) + if (blk != null && !blk.isAir(world, x, y, z) && ((blk.getPlayerRelativeBlockHardness(player, world, x, y, z) != 0))) { if (!blk.canHarvestBlock(player, meta) || !isRightMaterial(mat, materialsListing)) { return; @@ -135,7 +122,7 @@ public final class ToolCapabilities { return true; } - if (InfusedDiamondAxe.oreDictLogs.contains(Arrays.asList(new Object[] {blk, Integer.valueOf(metadata)}))) { + if (InfusedDiamondAxe.oreDictLogs.contains(Arrays.asList(new Object[] { blk, Integer.valueOf(metadata) }))) { return true; } return false; @@ -252,7 +239,7 @@ public final class ToolCapabilities { } /* - * @author mDiyo + * @author mDiyo */ public static MovingObjectPosition raytraceFromEntity(World world, Entity player, boolean par3, double range) { diff --git a/src/main/java/com/arc/bloodarsenal/common/misc/WAILAPlugin.java b/src/main/java/com/arc/bloodarsenal/common/misc/WAILAPlugin.java index 51b740b..3eb33c5 100644 --- a/src/main/java/com/arc/bloodarsenal/common/misc/WAILAPlugin.java +++ b/src/main/java/com/arc/bloodarsenal/common/misc/WAILAPlugin.java @@ -1,23 +1,12 @@ package com.arc.bloodarsenal.common.misc; -import WayofTime.alchemicalWizardry.api.rituals.Rituals; -import WayofTime.alchemicalWizardry.common.items.sigil.SigilDivination; -import WayofTime.alchemicalWizardry.common.items.sigil.SigilSeer; -import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding; -import com.arc.bloodarsenal.common.block.BlockCompactedMRS; -import com.arc.bloodarsenal.common.block.BlockLPMaterializer; -import com.arc.bloodarsenal.common.block.BlockLifeInfuser; -import com.arc.bloodarsenal.common.block.BlockPortableAltar; -import com.arc.bloodarsenal.common.items.sigil.holding.SigilAugmentedHolding; -import com.arc.bloodarsenal.common.tileentity.TileCompactedMRS; -import com.arc.bloodarsenal.common.tileentity.TileLPMaterializer; -import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser; -import com.arc.bloodarsenal.common.tileentity.TilePortableAltar; import java.util.List; + import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaRegistrar; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -27,21 +16,37 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.rituals.Rituals; +import WayofTime.alchemicalWizardry.common.items.sigil.SigilDivination; +import WayofTime.alchemicalWizardry.common.items.sigil.SigilSeer; +import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding; + +import com.arc.bloodarsenal.common.block.BlockCompactedMRS; +import com.arc.bloodarsenal.common.block.BlockLPMaterializer; +import com.arc.bloodarsenal.common.block.BlockLifeInfuser; +import com.arc.bloodarsenal.common.block.BlockPortableAltar; +import com.arc.bloodarsenal.common.items.sigil.holding.SigilAugmentedHolding; +import com.arc.bloodarsenal.common.tileentity.TileCompactedMRS; +import com.arc.bloodarsenal.common.tileentity.TileLPMaterializer; +import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser; +import com.arc.bloodarsenal.common.tileentity.TilePortableAltar; + public class WAILAPlugin implements IWailaDataProvider { + @Override public ItemStack getWailaStack(IWailaDataAccessor data, IWailaConfigHandler cfg) { return data.getStack(); } @Override - public List getWailaHead( - ItemStack stack, List tip, IWailaDataAccessor data, IWailaConfigHandler cfg) { + public List getWailaHead(ItemStack stack, List tip, IWailaDataAccessor data, + IWailaConfigHandler cfg) { return tip; } @Override - public List getWailaBody( - ItemStack stack, List tip, IWailaDataAccessor data, IWailaConfigHandler cfg) { + public List getWailaBody(ItemStack stack, List tip, IWailaDataAccessor data, + IWailaConfigHandler cfg) { if (data.getTileEntity() != null) { if (data.getTileEntity() instanceof TilePortableAltar) { EntityPlayer player = data.getPlayer(); @@ -64,13 +69,13 @@ public class WAILAPlugin implements IWailaDataProvider { addTonsOfInfo(player, altar, tip, cfg); } else if (player.getCurrentEquippedItem().getItem() instanceof SigilOfHolding) { if (SigilOfHolding.getCurrentSigil(player.getCurrentEquippedItem()) - .getItem() - instanceof SigilDivination + .getItem() instanceof SigilDivination || SigilOfHolding.getCurrentSigil(player.getCurrentEquippedItem()) - .getItem() - instanceof SigilSeer) { - tip.add(StatCollector.translateToLocal("tooltip.currentEssence") + " " + red - + currentEssence); + .getItem() instanceof SigilSeer) { + tip.add( + StatCollector.translateToLocal("tooltip.currentEssence") + " " + + red + + currentEssence); tip.add(StatCollector.translateToLocal("tooltip.altarTier") + " " + red + tier); tip.add(StatCollector.translateToLocal("tooltip.capacity") + " " + red + capacity); } @@ -78,13 +83,13 @@ public class WAILAPlugin implements IWailaDataProvider { addTonsOfInfo(player, altar, tip, cfg); } else if (player.getCurrentEquippedItem().getItem() instanceof SigilAugmentedHolding) { if (SigilAugmentedHolding.getCurrentSigil(player.getCurrentEquippedItem()) - .getItem() - instanceof SigilDivination + .getItem() instanceof SigilDivination || SigilAugmentedHolding.getCurrentSigil(player.getCurrentEquippedItem()) - .getItem() - instanceof SigilSeer) { - tip.add(StatCollector.translateToLocal("tooltip.currentEssence") + " " + red - + currentEssence); + .getItem() instanceof SigilSeer) { + tip.add( + StatCollector.translateToLocal("tooltip.currentEssence") + " " + + red + + currentEssence); tip.add(StatCollector.translateToLocal("tooltip.altarTier") + " " + red + tier); tip.add(StatCollector.translateToLocal("tooltip.capacity") + " " + red + capacity); } @@ -102,20 +107,21 @@ public class WAILAPlugin implements IWailaDataProvider { int direction = tagCompound.getInteger("direction"); tip.add(StatCollector.translateToLocal("tooltip.ritualName") + " " + red + ritualName); - tip.add(StatCollector.translateToLocal("tooltip.running") + " " + red - + (isRunning - ? StatCollector.translateToLocal("tooltip.yes") - : StatCollector.translateToLocal("tooltip.no"))); + tip.add( + StatCollector.translateToLocal("tooltip.running") + " " + + red + + (isRunning ? StatCollector.translateToLocal("tooltip.yes") + : StatCollector.translateToLocal("tooltip.no"))); tip.add(StatCollector.translateToLocal("tooltip.direction") + " " + red + direction); } else if (data.getTileEntity() instanceof TileLifeInfuser) { EnumChatFormatting red = EnumChatFormatting.RED; - // NBTTagCompound tagCompound = data.getNBTData(); + // NBTTagCompound tagCompound = data.getNBTData(); - // boolean isRunning = tagCompound.getBoolean("isRunning"); + // boolean isRunning = tagCompound.getBoolean("isRunning"); int currentEssence = ((TileLifeInfuser) data.getTileEntity()).getFluidAmount(); tip.add(StatCollector.translateToLocal("message.tile.contains") + " " + red + currentEssence); - // tip.add(StatCollector.translateToLocal("tooltip.running") + " " + red + (isRunning ? + // tip.add(StatCollector.translateToLocal("tooltip.running") + " " + red + (isRunning ? // StatCollector.translateToLocal("tooltip.yes") : StatCollector.translateToLocal("tooltip.no"))); } else if (data.getTileEntity() instanceof TileLPMaterializer) { EnumChatFormatting red = EnumChatFormatting.RED; @@ -129,8 +135,8 @@ public class WAILAPlugin implements IWailaDataProvider { return tip; } - protected void addTonsOfInfo( - EntityPlayer player, TilePortableAltar altar, List tip, IWailaConfigHandler cfg) { + protected void addTonsOfInfo(EntityPlayer player, TilePortableAltar altar, List tip, + IWailaConfigHandler cfg) { int speedUpgrades = altar.speedUpgrades; int efficiencyUpgrades = altar.efficiencyUpgrades; int sacrificeUpgrades = altar.sacrificeUpgrades; @@ -149,21 +155,22 @@ public class WAILAPlugin implements IWailaDataProvider { tip.add(StatCollector.translateToLocal("tooltip.displacementUpgrades") + " " + displacementUpgrades); tip.add(StatCollector.translateToLocal("tooltip.altarCapacitiveUpgrades") + " " + altarCapacitiveUpgrades); tip.add(StatCollector.translateToLocal("tooltip.orbCapacitiveUpgrades") + " " + orbCapacitiveUpgrades); - tip.add(StatCollector.translateToLocal("tooltip.betterCapacitiveUpgrades") + " " - + betterCapacitiveUpgrades); + tip.add( + StatCollector.translateToLocal("tooltip.betterCapacitiveUpgrades") + " " + + betterCapacitiveUpgrades); tip.add(StatCollector.translateToLocal("tooltip.accelerationUpgrades") + " " + accelerationUpgrades); } } @Override - public List getWailaTail( - ItemStack stack, List tip, IWailaDataAccessor data, IWailaConfigHandler cfg) { + public List getWailaTail(ItemStack stack, List tip, IWailaDataAccessor data, + IWailaConfigHandler cfg) { return tip; } @Override - public NBTTagCompound getNBTData( - EntityPlayerMP player, TileEntity tileEntity, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity tileEntity, NBTTagCompound tag, World world, + int x, int y, int z) { if (tileEntity != null) { tileEntity.writeToNBT(tag); } diff --git a/src/main/java/com/arc/bloodarsenal/common/potion/PotionBloodArsenal.java b/src/main/java/com/arc/bloodarsenal/common/potion/PotionBloodArsenal.java index 7b245f5..064efc0 100644 --- a/src/main/java/com/arc/bloodarsenal/common/potion/PotionBloodArsenal.java +++ b/src/main/java/com/arc/bloodarsenal/common/potion/PotionBloodArsenal.java @@ -1,14 +1,17 @@ package com.arc.bloodarsenal.common.potion; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.potion.Potion; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class PotionBloodArsenal extends Potion { - private static final ResourceLocation resourceLocation = - new ResourceLocation("bloodarsenal", "textures/misc/potions.png"); + + private static final ResourceLocation resourceLocation = new ResourceLocation( + "bloodarsenal", + "textures/misc/potions.png"); public PotionBloodArsenal(int par1, boolean par2, int par3) { super(par1, par2, par3); diff --git a/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectEnchant.java b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectEnchant.java index b56c6a0..b3ded22 100644 --- a/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectEnchant.java +++ b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectEnchant.java @@ -1,15 +1,8 @@ package com.arc.bloodarsenal.common.rituals; -import WayofTime.alchemicalWizardry.ModBlocks; -import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; -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.common.tileEntity.TEAltar; -import WayofTime.alchemicalWizardry.common.tileEntity.TEPedestal; import java.util.ArrayList; import java.util.List; + import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.effect.EntityLightningBolt; @@ -24,8 +17,18 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.ModBlocks; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +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.common.tileEntity.TEAltar; +import WayofTime.alchemicalWizardry.common.tileEntity.TEPedestal; + public class RitualEffectEnchant extends RitualEffect { - private static int[][] PEDESTAL_LOCATIONS = new int[][] {{3, 1, 0}, {-3, 1, 0}, {0, 1, 3}, {0, 1, -3}}; + + private static int[][] PEDESTAL_LOCATIONS = new int[][] { { 3, 1, 0 }, { -3, 1, 0 }, { 0, 1, 3 }, { 0, 1, -3 } }; public int stage = 0; public int stageTicks = 0; @@ -35,7 +38,7 @@ public class RitualEffectEnchant extends RitualEffect { public ItemStack enchantItem = null; public List enchants = new ArrayList(); - // public List itemList = new ArrayList(); + // public List itemList = new ArrayList(); @Override public void performEffect(IMasterRitualStone ritualStone) { @@ -137,8 +140,7 @@ public class RitualEffectEnchant extends RitualEffect { for (EnchantmentData d : enchants) { Enchantment ench = Enchantment.enchantmentsList[d.enchant]; - lpRequired += (int) (500F - * ((15 - Math.min(15, ench.getWeight())) * 1.05F) + lpRequired += (int) (500F * ((15 - Math.min(15, ench.getWeight())) * 1.05F) * ((3F + d.level * d.level) * 0.25F) * (0.9F + enchants.size() * 0.05F)); player.addChatComponentMessage(new ChatComponentText("Lp required: " + lpRequired)); @@ -391,6 +393,7 @@ public class RitualEffectEnchant extends RitualEffect { } private static class EnchantmentData { + public int enchant, level; public EnchantmentData(int enchant, int level) { diff --git a/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectFishing.java b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectFishing.java index 260e44c..0fa0159 100644 --- a/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectFishing.java +++ b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectFishing.java @@ -1,15 +1,9 @@ package com.arc.bloodarsenal.common.rituals; -import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry; -import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; -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.common.spell.complex.effect.SpellHelper; import java.util.ArrayList; import java.util.List; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; @@ -20,7 +14,16 @@ import net.minecraft.world.World; import net.minecraftforge.common.FishingHooks; import net.minecraftforge.common.util.ForgeDirection; +import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +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.common.spell.complex.effect.SpellHelper; + public class RitualEffectFishing extends RitualEffect { + @Override public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); @@ -75,8 +78,11 @@ public class RitualEffectFishing extends RitualEffect { SoulNetworkHandler.causeNauseaToPlayer(owner); } else { boolean hasTerrae = canDrainReagent(ritualStone, ReagentRegistry.terraeReagent, terraeDrain, true); - boolean hasOrbisTerrae = - canDrainReagent(ritualStone, ReagentRegistry.orbisTerraeReagent, orbisTerraeDrain, true); + boolean hasOrbisTerrae = canDrainReagent( + ritualStone, + ReagentRegistry.orbisTerraeReagent, + orbisTerraeDrain, + true); boolean hasPotentia = canDrainReagent(ritualStone, ReagentRegistry.potentiaReagent, potentiaDrain, true); int i = hasTerrae ? -5 : -1; @@ -92,7 +98,10 @@ public class RitualEffectFishing extends RitualEffect { if (block.isAssociatedBlock(Blocks.water) || block.isAssociatedBlock(Blocks.flowing_water)) { if (rand.nextInt(9) >= (hasPotentia ? 6 : 8)) { ItemStack fishStack = FishingHooks.getRandomFishable( - rand, chance, hasOrbisTerrae ? rand.nextInt(90) : -1, hasPotentia ? 2 : -1); + rand, + chance, + hasOrbisTerrae ? rand.nextInt(90) : -1, + hasPotentia ? 2 : -1); if (fishStack != null) { SpellHelper.insertStackIntoInventory(fishStack, tileEntity, ForgeDirection.DOWN); SoulNetworkHandler.syphonFromNetwork(owner, 500); diff --git a/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectMidas.java b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectMidas.java index b0c6e73..7668283 100644 --- a/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectMidas.java +++ b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectMidas.java @@ -1,14 +1,9 @@ package com.arc.bloodarsenal.common.rituals; -import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; -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.common.spell.complex.effect.SpellHelper; import java.util.ArrayList; import java.util.Iterator; import java.util.List; + import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Items; @@ -17,7 +12,15 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +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.common.spell.complex.effect.SpellHelper; + public class RitualEffectMidas extends RitualEffect { + private static double rand; @Override @@ -43,9 +46,12 @@ public class RitualEffectMidas extends RitualEffect { if (ritualStone.getVar1() == 0) { int d0 = 0; AxisAlignedBB axisalignedbb = AxisAlignedBB.getBoundingBox( - (double) x, (double) y + 1, (double) z, (double) (x + 1), (double) (y + 2), (double) - (z + 1)) - .expand(d0, d0, d0); + (double) x, + (double) y + 1, + (double) z, + (double) (x + 1), + (double) (y + 2), + (double) (z + 1)).expand(d0, d0, d0); List list = world.getEntitiesWithinAABB(EntityItem.class, axisalignedbb); Iterator iterator = list.iterator(); EntityItem item; @@ -68,7 +74,16 @@ public class RitualEffectMidas extends RitualEffect { if (world.rand.nextInt(10) == 0) { SpellHelper.sendIndexedParticleToAllAround( - world, x, y, z, 20, world.provider.dimensionId, 1, x, y, z); + world, + x, + y, + z, + 20, + world.provider.dimensionId, + 1, + x, + y, + z); } } data.currentEssence = currentEssence - getCostPerRefresh(); diff --git a/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectMobDisable.java b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectMobDisable.java index 1a1810a..a455526 100644 --- a/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectMobDisable.java +++ b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectMobDisable.java @@ -1,14 +1,9 @@ package com.arc.bloodarsenal.common.rituals; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry; -import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; -import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; -import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; -import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import java.util.ArrayList; import java.util.Collection; import java.util.List; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityEnderman; @@ -18,7 +13,15 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; +import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; + public class RitualEffectMobDisable extends RitualEffect { + @Override public void performEffect(IMasterRitualStone ritualStone) { String owner = ritualStone.getOwner(); @@ -38,16 +41,19 @@ public class RitualEffectMobDisable extends RitualEffect { int d0 = 10; int vertRange = hasPotentia ? 20 : 10; AxisAlignedBB axisalignedbb = AxisAlignedBB.getBoundingBox( - (double) x, (double) y, (double) z, (double) (x + 1), (double) (y + 1), (double) (z + 1)) - .expand(d0, vertRange, d0); + (double) x, + (double) y, + (double) z, + (double) (x + 1), + (double) (y + 1), + (double) (z + 1)).expand(d0, vertRange, d0); List list = world.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb); if (currentEssence < this.getCostPerRefresh() * list.size()) { SoulNetworkHandler.causeNauseaToPlayer(owner); } else { for (EntityLivingBase livingEntity : list) { - if (!livingEntity.isEntityAlive() - || livingEntity instanceof EntityPlayer + if (!livingEntity.isEntityAlive() || livingEntity instanceof EntityPlayer || AlchemicalWizardry.wellBlacklist.contains(livingEntity.getClass())) { continue; } diff --git a/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectWithering.java b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectWithering.java index 7140520..6fc9525 100644 --- a/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectWithering.java +++ b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectWithering.java @@ -1,5 +1,15 @@ package com.arc.bloodarsenal.common.rituals; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; + import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry; import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; @@ -7,16 +17,9 @@ import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.World; public class RitualEffectWithering extends RitualEffect { + public static final int reductusDrain = 15; public static final int virtusDrain = 15; public static final int praesidiumDrain = 5; @@ -49,8 +52,8 @@ public class RitualEffectWithering extends RitualEffect { int range = 15 * (hasPraesidium ? 3 : 1); int vertRange = 15 * (hasPraesidium ? 3 : 1); - List list = - SpellHelper.getLivingEntitiesInRange(world, x + 0.5, y + 0.5, z + 0.5, range, vertRange); + List list = SpellHelper + .getLivingEntitiesInRange(world, x + 0.5, y + 0.5, z + 0.5, range, vertRange); int entityCount = 0; for (EntityLivingBase livingEntity : list) { diff --git a/src/main/java/com/arc/bloodarsenal/common/rituals/RitualRegistry.java b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualRegistry.java index 4b684fe..41381b7 100644 --- a/src/main/java/com/arc/bloodarsenal/common/rituals/RitualRegistry.java +++ b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualRegistry.java @@ -1,11 +1,14 @@ package com.arc.bloodarsenal.common.rituals; +import net.minecraft.util.ResourceLocation; + import WayofTime.alchemicalWizardry.api.rituals.Rituals; import WayofTime.alchemicalWizardry.common.renderer.AlchemyCircleRenderer; + import com.arc.bloodarsenal.common.BloodArsenalConfig; -import net.minecraft.util.ResourceLocation; public class RitualRegistry { + public static void initRituals() { String resource = "alchemicalwizardry:textures/models/SimpleTransCircle.png"; @@ -16,7 +19,17 @@ public class RitualRegistry { new RitualEffectWithering(), "Ritual of Withering", new AlchemyCircleRenderer( - new ResourceLocation(resource), 0, 0, 0, 255, 0, 0.501, 0.501, 0, 1.5, false)); + new ResourceLocation(resource), + 0, + 0, + 0, + 255, + 0, + 0.501, + 0.501, + 0, + 1.5, + false)); Rituals.registerRitual( "ARC002Midas", 1, @@ -24,7 +37,17 @@ public class RitualRegistry { new RitualEffectMidas(), "Midas Touch", new AlchemyCircleRenderer( - new ResourceLocation(resource), 0, 0, 0, 255, 0, 0.501, 0.501, 0, 2.5, false)); + new ResourceLocation(resource), + 0, + 0, + 0, + 255, + 0, + 0.501, + 0.501, + 0, + 2.5, + false)); Rituals.registerRitual( "ARC003Enchant", 2, @@ -32,7 +55,17 @@ public class RitualRegistry { new RitualEffectEnchant(), "The Enchantress's Spell", new AlchemyCircleRenderer( - new ResourceLocation(resource), 0, 0, 0, 255, 0, 0.501, 0.501, 0, 1.5, false)); + new ResourceLocation(resource), + 0, + 0, + 0, + 255, + 0, + 0.501, + 0.501, + 0, + 1.5, + false)); Rituals.registerRitual("ARC004MobDisable", 2, 25000, new RitualEffectMobDisable(), "Ritual of Mob Oppression"); Rituals.registerRitual("ARC005Fisherman", 1, 10000, new RitualEffectFishing(), "Fisherman's Hymn"); diff --git a/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodArsenalResearchItem.java b/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodArsenalResearchItem.java index daa695d..4b20309 100644 --- a/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodArsenalResearchItem.java +++ b/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodArsenalResearchItem.java @@ -1,23 +1,27 @@ package com.arc.bloodarsenal.common.thaumcraft; -import com.arc.bloodarsenal.common.BloodArsenalConfig; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; + import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchItem; +import com.arc.bloodarsenal.common.BloodArsenalConfig; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BloodArsenalResearchItem extends ResearchItem { + String inter = null; public BloodArsenalResearchItem(String par1, String x) { super(par1, x); } - public BloodArsenalResearchItem( - String par1, String x, AspectList tags, int y, int z, int par5, ResourceLocation icon) { + public BloodArsenalResearchItem(String par1, String x, AspectList tags, int y, int z, int par5, + ResourceLocation icon) { super(par1, x, tags, y, z, par5, icon); } @@ -25,14 +29,14 @@ public class BloodArsenalResearchItem extends ResearchItem { super(par1, x, tags, y, z, par5, icon); } - public BloodArsenalResearchItem( - String par1, String x, String mod, AspectList tags, int y, int z, int par5, ResourceLocation icon) { + public BloodArsenalResearchItem(String par1, String x, String mod, AspectList tags, int y, int z, int par5, + ResourceLocation icon) { super(par1, x, tags, y, z, par5, icon); this.inter = mod; } - public BloodArsenalResearchItem( - String par1, String x, String mod, AspectList tags, int y, int z, int par5, ItemStack icon) { + public BloodArsenalResearchItem(String par1, String x, String mod, AspectList tags, int y, int z, int par5, + ItemStack icon) { super(par1, x, tags, y, z, par5, icon); this.inter = mod; } @@ -49,7 +53,8 @@ public class BloodArsenalResearchItem extends ResearchItem { return BloodArsenalConfig.researchTag ? (this.inter == null ? "[BA] " + StatCollector.translateToLocal("blood_arsenal.research_text." + this.key) - : "[BA] " + this.inter + " " + : "[BA] " + this.inter + + " " + StatCollector.translateToLocal("blood_arsenal.research_text." + this.key)) : StatCollector.translateToLocal("blood_arsenal.research_text." + this.key); } diff --git a/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodArsenalThaumcraft.java b/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodArsenalThaumcraft.java index 05840b2..0cf04c0 100644 --- a/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodArsenalThaumcraft.java +++ b/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodArsenalThaumcraft.java @@ -1,12 +1,10 @@ /** - * Taken from SpitefulFox's ForbiddenMagic - * https://github.com/SpitefulFox/ForbiddenMagic + * Taken from SpitefulFox's ForbiddenMagic https://github.com/SpitefulFox/ForbiddenMagic */ package com.arc.bloodarsenal.common.thaumcraft; -import com.arc.bloodarsenal.common.block.ModBlocks; -import com.arc.bloodarsenal.common.items.ModItems; import net.minecraft.item.ItemStack; + import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -16,7 +14,11 @@ import thaumcraft.api.wands.StaffRod; import thaumcraft.api.wands.WandCap; import thaumcraft.api.wands.WandRod; +import com.arc.bloodarsenal.common.block.ModBlocks; +import com.arc.bloodarsenal.common.items.ModItems; + public class BloodArsenalThaumcraft { + public static void addResearch() { final String FORBIDDEN = "FORBIDDEN"; @@ -30,31 +32,23 @@ public class BloodArsenalThaumcraft { 3, (new AspectList()).add(Aspect.LIFE, 32).add(Aspect.MAGIC, 24).add(Aspect.TOOL, 16), bloodRod.getItem(), - new ItemStack[] { - new ItemStack(ModItems.amorphic_catalyst), - new ItemStack(ModItems.amorphic_catalyst), - new ItemStack(ModBlocks.blood_infused_wood), - new ItemStack(ModBlocks.blood_infused_wood), - new ItemStack(ModBlocks.blood_infused_wood), - new ItemStack(ModItems.blood_infused_glowstone_dust) - }); + new ItemStack[] { new ItemStack(ModItems.amorphic_catalyst), new ItemStack(ModItems.amorphic_catalyst), + new ItemStack(ModBlocks.blood_infused_wood), new ItemStack(ModBlocks.blood_infused_wood), + new ItemStack(ModBlocks.blood_infused_wood), + new ItemStack(ModItems.blood_infused_glowstone_dust) }); new BloodArsenalResearchItem( - "ROD_blood_wood", - FORBIDDEN, - (new AspectList()) - .add(Aspect.LIFE, 10) - .add(Aspect.MAGIC, 8) - .add(Aspect.TOOL, 4), - 4, - -5, - 2, - new ItemStack(ModItems.wandCore, 1, 0)) - .setPages( - new ResearchPage("blood_arsenal.research_page.ROD_blood_wood.1"), - new ResearchPage("blood_arsenal.research_page.ROD_blood_wood.2"), - new ResearchPage(rod_blood_wood)) - .setParents("ROD_blood") - .registerResearchItem(); + "ROD_blood_wood", + FORBIDDEN, + (new AspectList()).add(Aspect.LIFE, 10).add(Aspect.MAGIC, 8).add(Aspect.TOOL, 4), + 4, + -5, + 2, + new ItemStack(ModItems.wandCore, 1, 0)) + .setPages( + new ResearchPage("blood_arsenal.research_page.ROD_blood_wood.1"), + new ResearchPage("blood_arsenal.research_page.ROD_blood_wood.2"), + new ResearchPage(rod_blood_wood)) + .setParents("ROD_blood").registerResearchItem(); ThaumcraftApi.addWarpToResearch("ROD_blood_wood", 2); ThaumcraftApi.addWarpToItem(new ItemStack(ModItems.wandCore, 1, 0), 2); InfusionRecipe cap_blood_iron = ThaumcraftApi.addInfusionCraftingRecipe( @@ -63,74 +57,53 @@ public class BloodArsenalThaumcraft { 3, (new AspectList()).add(Aspect.LIFE, 24).add(Aspect.WATER, 24).add(Aspect.MAGIC, 20), alchemicalCap.getItem(), - new ItemStack[] { - new ItemStack(ModItems.amorphic_catalyst), - new ItemStack(ModItems.amorphic_catalyst), - new ItemStack(ModItems.blood_infused_iron), - new ItemStack(ModItems.blood_infused_iron), - new ItemStack(ModItems.blood_infused_iron), - new ItemStack(ModItems.blood_infused_glowstone_dust), - new ItemStack(ModItems.blood_infused_glowstone_dust) - }); + new ItemStack[] { new ItemStack(ModItems.amorphic_catalyst), new ItemStack(ModItems.amorphic_catalyst), + new ItemStack(ModItems.blood_infused_iron), new ItemStack(ModItems.blood_infused_iron), + new ItemStack(ModItems.blood_infused_iron), + new ItemStack(ModItems.blood_infused_glowstone_dust), + new ItemStack(ModItems.blood_infused_glowstone_dust) }); new BloodArsenalResearchItem( - "CAP_blood_iron", - FORBIDDEN, - (new AspectList()).add(Aspect.LIFE, 6).add(Aspect.TOOL, 2), - 2, - -5, - 2, - new ItemStack(ModItems.wandCap, 1, 0)) - .setPages( - new ResearchPage("blood_arsenal.research_page.CAP_blood_iron.1"), - new ResearchPage(cap_blood_iron)) - .setParents("ROD_blood_wood", "CAP_alchemical") - .registerResearchItem(); + "CAP_blood_iron", + FORBIDDEN, + (new AspectList()).add(Aspect.LIFE, 6).add(Aspect.TOOL, 2), + 2, + -5, + 2, + new ItemStack(ModItems.wandCap, 1, 0)) + .setPages( + new ResearchPage("blood_arsenal.research_page.CAP_blood_iron.1"), + new ResearchPage(cap_blood_iron)) + .setParents("ROD_blood_wood", "CAP_alchemical").registerResearchItem(); ThaumcraftApi.addWarpToResearch("CAP_blood_iron", 1); ThaumcraftApi.addWarpToItem(new ItemStack(ModItems.wandCap), 1); InfusionRecipe staff_blood_wood = ThaumcraftApi.addInfusionCraftingRecipe( "ROD_blood_wood_staff", new ItemStack(ModItems.wandCore, 1, 1), 6, - (new AspectList()) - .add(Aspect.LIFE, 64) - .add(Aspect.MAGIC, 48) - .add(Aspect.WATER, 32) + (new AspectList()).add(Aspect.LIFE, 64).add(Aspect.MAGIC, 48).add(Aspect.WATER, 32) .add(Aspect.TOOL, 24), bloodStaff.getItem(), - new ItemStack[] { - new ItemStack(ModItems.wandCore, 1, 0), - new ItemStack(ModItems.blood_infused_glowstone_dust), - new ItemStack(ModItems.amorphic_catalyst), - new ItemStack(ModBlocks.blood_infused_wood), - new ItemStack(ModBlocks.blood_infused_wood), - new ItemStack(ModItems.amorphic_catalyst), - new ItemStack(ModItems.blood_infused_glowstone_dust), - new ItemStack(ModItems.wandCore, 1, 0), - new ItemStack(ModItems.blood_infused_glowstone_dust), - new ItemStack(ModItems.amorphic_catalyst), - new ItemStack(ModBlocks.blood_infused_wood), - new ItemStack(ModBlocks.blood_infused_wood), - new ItemStack(ModItems.amorphic_catalyst), - new ItemStack(ModItems.blood_infused_glowstone_dust) - }); + new ItemStack[] { new ItemStack(ModItems.wandCore, 1, 0), + new ItemStack(ModItems.blood_infused_glowstone_dust), new ItemStack(ModItems.amorphic_catalyst), + new ItemStack(ModBlocks.blood_infused_wood), new ItemStack(ModBlocks.blood_infused_wood), + new ItemStack(ModItems.amorphic_catalyst), new ItemStack(ModItems.blood_infused_glowstone_dust), + new ItemStack(ModItems.wandCore, 1, 0), new ItemStack(ModItems.blood_infused_glowstone_dust), + new ItemStack(ModItems.amorphic_catalyst), new ItemStack(ModBlocks.blood_infused_wood), + new ItemStack(ModBlocks.blood_infused_wood), new ItemStack(ModItems.amorphic_catalyst), + new ItemStack(ModItems.blood_infused_glowstone_dust) }); new BloodArsenalResearchItem( - "ROD_blood_wood_staff", - FORBIDDEN, - (new AspectList()) - .add(Aspect.LIFE, 16) - .add(Aspect.MAGIC, 12) - .add(Aspect.TOOL, 8), - 5, - -3, - 3, - new ItemStack(ModItems.wandCore, 1, 1)) - .setPages( - new ResearchPage("blood_arsenal.research_page.ROD_blood_wood_staff.1"), - new ResearchPage(staff_blood_wood)) - .setParents("ROD_blood_wood", "ROD_blood_staff") - .setHidden() - .setSpecial() - .registerResearchItem(); + "ROD_blood_wood_staff", + FORBIDDEN, + (new AspectList()).add(Aspect.LIFE, 16).add(Aspect.MAGIC, 12).add(Aspect.TOOL, 8), + 5, + -3, + 3, + new ItemStack(ModItems.wandCore, 1, 1)) + .setPages( + new ResearchPage("blood_arsenal.research_page.ROD_blood_wood_staff.1"), + new ResearchPage(staff_blood_wood)) + .setParents("ROD_blood_wood", "ROD_blood_staff").setHidden().setSpecial() + .registerResearchItem(); ThaumcraftApi.addWarpToResearch("ROD_blood_wood_staff", 3); ThaumcraftApi.addWarpToItem(new ItemStack(ModItems.wandCore, 1, 1), 4); } diff --git a/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodWoodStaffUpdate.java b/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodWoodStaffUpdate.java index fd03a03..c5f3cef 100644 --- a/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodWoodStaffUpdate.java +++ b/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodWoodStaffUpdate.java @@ -1,18 +1,19 @@ /** - * Taken from SpitefulFox's ForbiddenMagic - * https://github.com/SpitefulFox/ForbiddenMagic + * Taken from SpitefulFox's ForbiddenMagic https://github.com/SpitefulFox/ForbiddenMagic */ package com.arc.bloodarsenal.common.thaumcraft; -import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; + import thaumcraft.api.aspects.Aspect; import thaumcraft.api.wands.IWandRodOnUpdate; import thaumcraft.common.items.wands.ItemWandCasting; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; public class BloodWoodStaffUpdate implements IWandRodOnUpdate { + Aspect[] primals = (Aspect[]) Aspect.getPrimalAspects().toArray(new Aspect[0]); public BloodWoodStaffUpdate() {} @@ -26,15 +27,9 @@ public class BloodWoodStaffUpdate implements IWandRodOnUpdate { SoulNetworkHandler.checkAndSetItemOwner(itemstack, player); int cost; - if (((ItemWandCasting) itemstack.getItem()) - .getCap(itemstack) - .getTag() - .equals("alchemical")) { + if (((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag().equals("alchemical")) { cost = 12; - } else if (((ItemWandCasting) itemstack.getItem()) - .getCap(itemstack) - .getTag() - .equals("blood_iron")) { + } else if (((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag().equals("blood_iron")) { cost = 10; } else { cost = 13; @@ -59,8 +54,7 @@ public class BloodWoodStaffUpdate implements IWandRodOnUpdate { } } - } catch (Exception e) { - } + } catch (Exception e) {} } } diff --git a/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodWoodWandUpdate.java b/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodWoodWandUpdate.java index 558fd85..cd03008 100644 --- a/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodWoodWandUpdate.java +++ b/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodWoodWandUpdate.java @@ -1,17 +1,18 @@ /** - * Taken from SpitefulFox's ForbiddenMagic - * https://github.com/SpitefulFox/ForbiddenMagic + * Taken from SpitefulFox's ForbiddenMagic https://github.com/SpitefulFox/ForbiddenMagic */ package com.arc.bloodarsenal.common.thaumcraft; -import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; + import thaumcraft.api.aspects.Aspect; import thaumcraft.api.wands.IWandRodOnUpdate; import thaumcraft.common.items.wands.ItemWandCasting; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; public class BloodWoodWandUpdate implements IWandRodOnUpdate { + Aspect[] primals = (Aspect[]) Aspect.getPrimalAspects().toArray(new Aspect[0]); public BloodWoodWandUpdate() {} @@ -21,15 +22,9 @@ public class BloodWoodWandUpdate implements IWandRodOnUpdate { try { SoulNetworkHandler.checkAndSetItemOwner(itemstack, player); byte e; - if (((ItemWandCasting) itemstack.getItem()) - .getCap(itemstack) - .getTag() - .equals("alchemical")) { + if (((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag().equals("alchemical")) { e = 12; - } else if (((ItemWandCasting) itemstack.getItem()) - .getCap(itemstack) - .getTag() - .equals("blood_iron")) { + } else if (((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag().equals("blood_iron")) { e = 10; } else { e = 13; diff --git a/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodyWandCap.java b/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodyWandCap.java index f657b79..5ba0b9e 100644 --- a/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodyWandCap.java +++ b/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodyWandCap.java @@ -1,29 +1,25 @@ /** - * Taken from SpitefulFox's ForbiddenMagic - * https://github.com/SpitefulFox/ForbiddenMagic + * Taken from SpitefulFox's ForbiddenMagic https://github.com/SpitefulFox/ForbiddenMagic */ package com.arc.bloodarsenal.common.thaumcraft; import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; + import thaumcraft.api.aspects.Aspect; import thaumcraft.api.wands.WandCap; public class BloodyWandCap extends WandCap { + public BloodyWandCap(String tag, float discount, ItemStack item, int craftCost, ResourceLocation skin) { super(tag, discount, item, craftCost); this.setTexture(skin); } - public BloodyWandCap( - String tag, - float discount, - List specialAspects, - float discountSpecial, - ItemStack item, - int craftCost, - ResourceLocation skin) { + public BloodyWandCap(String tag, float discount, List specialAspects, float discountSpecial, ItemStack item, + int craftCost, ResourceLocation skin) { super(tag, discount, specialAspects, discountSpecial, item, craftCost); this.setTexture(skin); } diff --git a/src/main/java/com/arc/bloodarsenal/common/thaumcraft/ItemWandCaps.java b/src/main/java/com/arc/bloodarsenal/common/thaumcraft/ItemWandCaps.java index 62628e7..c1e90c3 100644 --- a/src/main/java/com/arc/bloodarsenal/common/thaumcraft/ItemWandCaps.java +++ b/src/main/java/com/arc/bloodarsenal/common/thaumcraft/ItemWandCaps.java @@ -1,21 +1,24 @@ /** - * Taken from SpitefulFox's ForbiddenMagic - * https://github.com/SpitefulFox/ForbiddenMagic + * Taken from SpitefulFox's ForbiddenMagic https://github.com/SpitefulFox/ForbiddenMagic */ package com.arc.bloodarsenal.common.thaumcraft; -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import com.arc.bloodarsenal.common.BloodArsenal; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemWandCaps extends Item { - public final String[] types = new String[] {"blood_iron"}; + + public final String[] types = new String[] { "blood_iron" }; public IIcon[] icon; public ItemWandCaps() { diff --git a/src/main/java/com/arc/bloodarsenal/common/thaumcraft/ItemWandCores.java b/src/main/java/com/arc/bloodarsenal/common/thaumcraft/ItemWandCores.java index 86d4045..4fca61a 100644 --- a/src/main/java/com/arc/bloodarsenal/common/thaumcraft/ItemWandCores.java +++ b/src/main/java/com/arc/bloodarsenal/common/thaumcraft/ItemWandCores.java @@ -1,25 +1,29 @@ /** - * Taken from SpitefulFox's ForbiddenMagic - * https://github.com/SpitefulFox/ForbiddenMagic + * Taken from SpitefulFox's ForbiddenMagic https://github.com/SpitefulFox/ForbiddenMagic */ package com.arc.bloodarsenal.common.thaumcraft; -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; + import thaumcraft.api.ItemApi; import thaumcraft.api.wands.WandCap; import thaumcraft.api.wands.WandRod; import thaumcraft.common.items.wands.ItemWandCasting; +import com.arc.bloodarsenal.common.BloodArsenal; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemWandCores extends Item { - public final String[] types = new String[] {"blood_wood", "blood_wood_staff"}; + + public final String[] types = new String[] { "blood_wood", "blood_wood_staff" }; public IIcon[] icon; public ItemWandCores() { diff --git a/src/main/java/com/arc/bloodarsenal/common/tileentity/FluidTankRestricted.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/FluidTankRestricted.java index b84eee9..bb3d706 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tileentity/FluidTankRestricted.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/FluidTankRestricted.java @@ -5,6 +5,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; public class FluidTankRestricted extends FluidTank { + String[] name; public FluidTankRestricted(int capacity, String... name) { diff --git a/src/main/java/com/arc/bloodarsenal/common/tileentity/PacketHandler.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/PacketHandler.java index 79429a1..bc9c9ed 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tileentity/PacketHandler.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/PacketHandler.java @@ -1,6 +1,14 @@ package com.arc.bloodarsenal.common.tileentity; +import java.util.EnumMap; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.network.Packet; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + 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; @@ -12,13 +20,9 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; -import java.util.EnumMap; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.network.Packet; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; public enum PacketHandler { + INSTANCE; private EnumMap channels; @@ -41,6 +45,7 @@ public enum PacketHandler { } private static class TilePortableAltarMessageHandler extends SimpleChannelInboundHandler { + @Override protected void channelRead0(ChannelHandlerContext ctx, TilePortableAltarMessage msg) throws Exception { World world = BloodArsenal.proxy.getClientWorld(); @@ -55,6 +60,7 @@ public enum PacketHandler { } private static class TileLifeInfuserMessageHandler extends SimpleChannelInboundHandler { + @Override protected void channelRead0(ChannelHandlerContext ctx, TileLifeInfuserMessage msg) throws Exception { World world = BloodArsenal.proxy.getClientWorld(); @@ -70,6 +76,7 @@ public enum PacketHandler { private static class TileLPMaterializerMessageHandler extends SimpleChannelInboundHandler { + @Override protected void channelRead0(ChannelHandlerContext ctx, TileLPMaterializerMessage msg) throws Exception { World world = BloodArsenal.proxy.getClientWorld(); @@ -84,10 +91,12 @@ public enum PacketHandler { } public static class BAMessage { + int index; } public static class TilePortableAltarMessage extends BAMessage { + int x; int y; int z; @@ -98,6 +107,7 @@ public enum PacketHandler { } public static class TileLifeInfuserMessage extends BAMessage { + int x; int y; int z; @@ -108,6 +118,7 @@ public enum PacketHandler { } public static class TileLPMaterializerMessage extends BAMessage { + int x; int y; int z; @@ -118,6 +129,7 @@ public enum PacketHandler { } private class ClientToServerCodec extends FMLIndexedMessageToMessageCodec { + public ClientToServerCodec() {} @Override @@ -127,13 +139,14 @@ public enum PacketHandler { @Override public void decodeInto(ChannelHandlerContext ctx, ByteBuf source, BAMessage msg) { - // int index = source.readInt(); + // int index = source.readInt(); System.out.println("Packet is recieved and being decoded"); } } private class BATileCodec extends FMLIndexedMessageToMessageCodec { + public BATileCodec() { addDiscriminator(0, TilePortableAltarMessage.class); addDiscriminator(1, TileLifeInfuserMessage.class); @@ -375,45 +388,29 @@ public enum PacketHandler { } public void sendTo(Packet message, EntityPlayerMP player) { - this.channels - .get(Side.SERVER) - .attr(FMLOutboundHandler.FML_MESSAGETARGET) + this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET) .set(FMLOutboundHandler.OutboundTarget.PLAYER); - this.channels - .get(Side.SERVER) - .attr(FMLOutboundHandler.FML_MESSAGETARGETARGS) - .set(player); + this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(player); this.channels.get(Side.SERVER).writeAndFlush(message); } public void sendToAll(Packet message) { - this.channels - .get(Side.SERVER) - .attr(FMLOutboundHandler.FML_MESSAGETARGET) + this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET) .set(FMLOutboundHandler.OutboundTarget.ALL); this.channels.get(Side.SERVER).writeAndFlush(message); } public void sendToAllAround(Packet message, NetworkRegistry.TargetPoint point) { - this.channels - .get(Side.SERVER) - .attr(FMLOutboundHandler.FML_MESSAGETARGET) + this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET) .set(FMLOutboundHandler.OutboundTarget.ALLAROUNDPOINT); - this.channels - .get(Side.SERVER) - .attr(FMLOutboundHandler.FML_MESSAGETARGETARGS) - .set(point); + this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(point); this.channels.get(Side.SERVER).writeAndFlush(message); } public void sendToServer(Packet message) { - this.channels - .get(Side.CLIENT) - .attr(FMLOutboundHandler.FML_MESSAGETARGET) + this.channels.get(Side.CLIENT).attr(FMLOutboundHandler.FML_MESSAGETARGET) .set(FMLOutboundHandler.OutboundTarget.TOSERVER); - this.channels - .get(Side.CLIENT) - .writeAndFlush(message) + this.channels.get(Side.CLIENT).writeAndFlush(message) .addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE); } } diff --git a/src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompactedMRS.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompactedMRS.java index bb5c5f2..fcf7b19 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompactedMRS.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompactedMRS.java @@ -1,18 +1,8 @@ package com.arc.bloodarsenal.common.tileentity; -import WayofTime.alchemicalWizardry.api.Int3; -import WayofTime.alchemicalWizardry.api.alchemy.energy.*; -import WayofTime.alchemicalWizardry.api.event.RitualActivatedEvent; -import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; -import WayofTime.alchemicalWizardry.api.rituals.LocalRitualStorage; -import WayofTime.alchemicalWizardry.api.rituals.RitualBreakMethod; -import WayofTime.alchemicalWizardry.api.rituals.Rituals; -import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; -import cpw.mods.fml.common.eventhandler.Event; import java.util.HashMap; import java.util.Map; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -28,7 +18,20 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; +import WayofTime.alchemicalWizardry.api.Int3; +import WayofTime.alchemicalWizardry.api.alchemy.energy.*; +import WayofTime.alchemicalWizardry.api.event.RitualActivatedEvent; +import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; +import WayofTime.alchemicalWizardry.api.rituals.LocalRitualStorage; +import WayofTime.alchemicalWizardry.api.rituals.RitualBreakMethod; +import WayofTime.alchemicalWizardry.api.rituals.Rituals; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; +import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; +import cpw.mods.fml.common.eventhandler.Event; + public class TileCompactedMRS extends TEMasterStone implements IMasterRitualStone { + private boolean isActive; private String owner; private String varString1; @@ -47,9 +50,8 @@ public class TileCompactedMRS extends TEMasterStone implements IMasterRitualSton protected Map attunedTankMap; public TileCompactedMRS() { - tanks = new ReagentContainer[] { - new ReagentContainer(1000), new ReagentContainer(1000), new ReagentContainer(1000) - }; + tanks = new ReagentContainer[] { new ReagentContainer(1000), new ReagentContainer(1000), + new ReagentContainer(1000) }; this.attunedTankMap = new HashMap(); isActive = false; @@ -200,15 +202,20 @@ public class TileCompactedMRS extends TEMasterStone implements IMasterRitualSton } @Override - public void activateRitual( - World world, int crystalLevel, ItemStack activationCrystal, EntityPlayer player, String crystalOwner) { + public void activateRitual(World world, int crystalLevel, ItemStack activationCrystal, EntityPlayer player, + String crystalOwner) { if (world.isRemote) { return; } // TODO - RitualActivatedEvent event = - new RitualActivatedEvent(this, crystalOwner, ritualName, player, activationCrystal, crystalLevel); + RitualActivatedEvent event = new RitualActivatedEvent( + this, + crystalOwner, + ritualName, + player, + activationCrystal, + crystalLevel); if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY) { player.addChatMessage( @@ -246,8 +253,8 @@ public class TileCompactedMRS extends TEMasterStone implements IMasterRitualSton return; } else { - int drain = - SoulNetworkHandler.syphonFromNetwork(eventOwnerKey, Rituals.getCostForActivation(ritualName)); + int drain = SoulNetworkHandler + .syphonFromNetwork(eventOwnerKey, Rituals.getCostForActivation(ritualName)); if (drain > 0) { player.addChatMessage( @@ -267,8 +274,9 @@ public class TileCompactedMRS extends TEMasterStone implements IMasterRitualSton zCoord); } } else { - player.addChatMessage(new ChatComponentText( - StatCollector.translateToLocal("message.masterstone.somethingstoppedyou"))); + player.addChatMessage( + new ChatComponentText( + StatCollector.translateToLocal("message.masterstone.somethingstoppedyou"))); return; } @@ -325,7 +333,16 @@ public class TileCompactedMRS extends TEMasterStone implements IMasterRitualSton if (worldTime % 100 == 0) { SpellHelper.sendIndexedParticleToAllAround( - worldObj, xCoord, yCoord, zCoord, 20, worldObj.provider.dimensionId, 1, xCoord, yCoord, zCoord); + worldObj, + xCoord, + yCoord, + zCoord, + 20, + worldObj.provider.dimensionId, + 1, + xCoord, + yCoord, + zCoord); worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } @@ -463,8 +480,7 @@ public class TileCompactedMRS extends TEMasterStone implements IMasterRitualSton ReagentStack remainingStack = resource.copy(); remainingStack.amount = maxFill - totalFill; - boolean doesReagentMatch = tanks[i].getReagent() == null - ? false + boolean doesReagentMatch = tanks[i].getReagent() == null ? false : tanks[i].getReagent().isReagentEqual(remainingStack); if (doesReagentMatch) { diff --git a/src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompacter.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompacter.java index b3f5597..dc121ec 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompacter.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompacter.java @@ -3,5 +3,6 @@ package com.arc.bloodarsenal.common.tileentity; import net.minecraft.tileentity.TileEntity; public class TileCompacter extends TileEntity { + public TileCompacter() {} } diff --git a/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLPMaterializer.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLPMaterializer.java index 28d883b..97b706e 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLPMaterializer.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLPMaterializer.java @@ -1,9 +1,5 @@ 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.common.BloodArsenalConfig; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; @@ -18,7 +14,14 @@ import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; + +import com.arc.bloodarsenal.common.BloodArsenalConfig; + public class TileLPMaterializer extends TileEntity implements IInventory, IFluidTank, IFluidHandler { + private ItemStack[] inv; protected FluidStack fluid; @@ -58,8 +61,9 @@ public class TileLPMaterializer extends TileEntity implements IInventory, IFluid setMainFluid(fluid); } - FluidStack fluidOut = - new FluidStack(AlchemicalWizardry.lifeEssenceFluid, par1NBTTagCompound.getInteger("outputAmount")); + FluidStack fluidOut = new FluidStack( + AlchemicalWizardry.lifeEssenceFluid, + par1NBTTagCompound.getInteger("outputAmount")); if (fluidOut != null) { setOutputFluid(fluidOut); @@ -208,8 +212,9 @@ public class TileLPMaterializer extends TileEntity implements IInventory, IFluid } public void sendChatInfoToPlayer(EntityPlayer player) { - player.addChatMessage(new ChatComponentText( - StatCollector.translateToLocal("message.tile.contains") + " " + this.getFluidAmount() + "LE")); + player.addChatMessage( + new ChatComponentText( + StatCollector.translateToLocal("message.tile.contains") + " " + this.getFluidAmount() + "LE")); } @Override @@ -225,8 +230,10 @@ public class TileLPMaterializer extends TileEntity implements IInventory, IFluid if (intData.length == 3) { for (int i = 0; i < 1; i++) { if (intData[i * 3 + 2] != 0) { - ItemStack is = - new ItemStack(Item.getItemById(intData[i * 3]), intData[i * 3 + 2], intData[i * 3 + 1]); + ItemStack is = new ItemStack( + Item.getItemById(intData[i * 3]), + intData[i * 3 + 2], + intData[i * 3 + 1]); inv[i] = is; } else { inv[i] = null; @@ -327,7 +334,16 @@ public class TileLPMaterializer extends TileEntity implements IInventory, IFluid if (worldObj.getWorldTime() % 4 == 0) { SpellHelper.sendIndexedParticleToAllAround( - worldObj, xCoord, yCoord, zCoord, 20, worldObj.provider.dimensionId, 1, xCoord, yCoord, zCoord); + worldObj, + xCoord, + yCoord, + zCoord, + 20, + worldObj.provider.dimensionId, + 1, + xCoord, + yCoord, + zCoord); } fluid.amount += 100; @@ -336,16 +352,16 @@ public class TileLPMaterializer extends TileEntity implements IInventory, IFluid private IFluidHandler getTankAbove() { return worldObj.getTileEntity(xCoord, yCoord + 1, zCoord) != null - && worldObj.getTileEntity(xCoord, yCoord + 1, zCoord) instanceof IFluidHandler - ? (IFluidHandler) worldObj.getTileEntity(xCoord, yCoord + 1, zCoord) - : null; + && worldObj.getTileEntity(xCoord, yCoord + 1, zCoord) instanceof IFluidHandler + ? (IFluidHandler) worldObj.getTileEntity(xCoord, yCoord + 1, zCoord) + : null; } private IFluidHandler getTankBelow() { return worldObj.getTileEntity(xCoord, yCoord - 1, zCoord) != null - && worldObj.getTileEntity(xCoord, yCoord - 1, zCoord) instanceof IFluidHandler - ? (IFluidHandler) worldObj.getTileEntity(xCoord, yCoord - 1, zCoord) - : null; + && worldObj.getTileEntity(xCoord, yCoord - 1, zCoord) instanceof IFluidHandler + ? (IFluidHandler) worldObj.getTileEntity(xCoord, yCoord - 1, zCoord) + : null; } // Fluid Stuffs @@ -394,8 +410,15 @@ 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, 1000)); + FluidEvent.fireEvent( + new FluidEvent.FluidDrainingEvent( + fluidOutput, + this.worldObj, + this.xCoord, + this.yCoord, + this.zCoord, + this, + 1000)); } } @@ -461,7 +484,7 @@ public class TileLPMaterializer extends TileEntity implements IInventory, IFluid public FluidTankInfo[] getTankInfo(ForgeDirection from) { FluidTank compositeTank = new FluidTank(capacity); compositeTank.setFluid(fluid); - return new FluidTankInfo[] {compositeTank.getInfo()}; + return new FluidTankInfo[] { compositeTank.getInfo() }; } public int[] buildFluidList() { diff --git a/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLifeInfuser.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLifeInfuser.java index 9296e25..fbff004 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLifeInfuser.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLifeInfuser.java @@ -1,8 +1,5 @@ package com.arc.bloodarsenal.common.tileentity; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -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; @@ -17,7 +14,13 @@ import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; + +import com.arc.bloodarsenal.common.items.tool.IFillable; + public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTank, IFluidHandler { + private ItemStack[] inv; public static final int sizeInv = 1; public int ticksExisted = 0; @@ -32,7 +35,7 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan private int bufferCapacity; - public FluidTank[] tanks = {new FluidTankRestricted(FluidContainerRegistry.BUCKET_VOLUME * 20, "Life Essence")}; + public FluidTank[] tanks = { new FluidTankRestricted(FluidContainerRegistry.BUCKET_VOLUME * 20, "Life Essence") }; public TileLifeInfuser() { this.inv = new ItemStack[1]; @@ -64,8 +67,9 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan setMainFluid(fluid); } - FluidStack fluidIn = - new FluidStack(AlchemicalWizardry.lifeEssenceFluid, par1NBTTagCompound.getInteger("inputAmount")); + FluidStack fluidIn = new FluidStack( + AlchemicalWizardry.lifeEssenceFluid, + par1NBTTagCompound.getInteger("inputAmount")); if (fluidIn != null) { setInputFluid(fluidIn); @@ -223,8 +227,7 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan yCoord, zCoord); } - } else if (inputStack.getItem().isDamageable() - && inputStack.getItem().isDamaged(inputStack)) { + } else if (inputStack.getItem().isDamageable() && inputStack.getItem().isDamaged(inputStack)) { int lpCost = 300; int damage = inputStack.getItemDamage(); @@ -280,8 +283,9 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan } public void sendChatInfoToPlayer(EntityPlayer player) { - player.addChatMessage(new ChatComponentText( - StatCollector.translateToLocal("message.tile.contains") + " " + this.getFluidAmount() + "LE")); + player.addChatMessage( + new ChatComponentText( + StatCollector.translateToLocal("message.tile.contains") + " " + this.getFluidAmount() + "LE")); } @Override @@ -297,8 +301,10 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan if (intData.length == 3) { for (int i = 0; i < 1; i++) { if (intData[i * 3 + 2] != 0) { - ItemStack is = - new ItemStack(Item.getItemById(intData[i * 3]), intData[i * 3 + 2], intData[i * 3 + 1]); + ItemStack is = new ItemStack( + Item.getItemById(intData[i * 3]), + intData[i * 3 + 2], + intData[i * 3 + 1]); inv[i] = is; } else { inv[i] = null; @@ -342,7 +348,7 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan } public int fillMainTank(int amount) // TODO STUFFS - { + { int filledAmount = Math.min(capacity - fluid.amount, amount); fluid.amount += filledAmount; @@ -393,14 +399,15 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan fluidInput = new FluidStack(resource, resource.amount); if (tile != null) { - FluidEvent.fireEvent(new FluidEvent.FluidFillingEvent( - fluidInput, - tile.getWorldObj(), - tile.xCoord, - tile.yCoord, - tile.zCoord, - this, - fluidInput.amount)); + FluidEvent.fireEvent( + new FluidEvent.FluidFillingEvent( + fluidInput, + tile.getWorldObj(), + tile.xCoord, + tile.yCoord, + tile.zCoord, + this, + fluidInput.amount)); } return fluidInput.amount; @@ -420,8 +427,15 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan } if (tile != null) { - FluidEvent.fireEvent(new FluidEvent.FluidFillingEvent( - fluidInput, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, this, fluidInput.amount)); + FluidEvent.fireEvent( + new FluidEvent.FluidFillingEvent( + fluidInput, + tile.getWorldObj(), + tile.xCoord, + tile.yCoord, + tile.zCoord, + this, + fluidInput.amount)); } return filled; @@ -500,7 +514,7 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan public FluidTankInfo[] getTankInfo(ForgeDirection from) { FluidTank compositeTank = new FluidTank(capacity); compositeTank.setFluid(fluid); - return new FluidTankInfo[] {compositeTank.getInfo()}; + return new FluidTankInfo[] { compositeTank.getInfo() }; } public int[] buildFluidList() { diff --git a/src/main/java/com/arc/bloodarsenal/common/tileentity/TilePortableAltar.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/TilePortableAltar.java index 648e46a..59a54d1 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tileentity/TilePortableAltar.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/TilePortableAltar.java @@ -1,13 +1,7 @@ package com.arc.bloodarsenal.common.tileentity; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipe; -import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; -import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -25,7 +19,16 @@ import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipe; +import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; +import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; + public class TilePortableAltar extends TileEntity implements IInventory, IFluidTank, IFluidHandler, IBloodAltar { + public static final int sizeInv = 1; private ItemStack[] inv; private int resultID; @@ -91,10 +94,10 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT /** * - * @return Amount filled + * @return Amount filled */ public int fillMainTank(int amount) // TODO - { + { int filledAmount = Math.min(capacity - fluid.amount, amount); fluid.amount += filledAmount; @@ -193,15 +196,17 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT setMainFluid(fluid); } - FluidStack fluidOut = - new FluidStack(AlchemicalWizardry.lifeEssenceFluid, par1NBTTagCompound.getInteger("outputAmount")); + FluidStack fluidOut = new FluidStack( + AlchemicalWizardry.lifeEssenceFluid, + par1NBTTagCompound.getInteger("outputAmount")); if (fluidOut != null) { setOutputFluid(fluidOut); } - FluidStack fluidIn = - new FluidStack(AlchemicalWizardry.lifeEssenceFluid, par1NBTTagCompound.getInteger("inputAmount")); + FluidStack fluidIn = new FluidStack( + AlchemicalWizardry.lifeEssenceFluid, + par1NBTTagCompound.getInteger("inputAmount")); if (fluidIn != null) { setInputFluid(fluidIn); @@ -483,16 +488,9 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT this.capacityMultiplier = capacityMultiplier; } - public void setUpgrades( - int speedUpgrades, - int efficiencyUpgrades, - int sacrificeUpgrades, - int selfSacrificeUpgrades, - int displacementUpgrades, - int altarCapacitiveUpgrades, - int orbCapacitiveUpgrades, - int betterCapacitiveUpgrades, - int accelerationUpgrades) { + public void setUpgrades(int speedUpgrades, int efficiencyUpgrades, int sacrificeUpgrades, int selfSacrificeUpgrades, + int displacementUpgrades, int altarCapacitiveUpgrades, int orbCapacitiveUpgrades, + int betterCapacitiveUpgrades, int accelerationUpgrades) { this.speedUpgrades = speedUpgrades; this.efficiencyUpgrades = efficiencyUpgrades; this.sacrificeUpgrades = sacrificeUpgrades; @@ -518,9 +516,7 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT } if (resource.getFluid().getID() - != (new FluidStack(AlchemicalWizardry.lifeEssenceFluid, 1)) - .getFluid() - .getID()) { + != (new FluidStack(AlchemicalWizardry.lifeEssenceFluid, 1)).getFluid().getID()) { return 0; } @@ -540,14 +536,15 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT fluidInput = new FluidStack(resource, Math.min(bufferCapacity, resource.amount)); if (tile != null) { - FluidEvent.fireEvent(new FluidEvent.FluidFillingEvent( - fluidInput, - tile.getWorldObj(), - tile.xCoord, - tile.yCoord, - tile.zCoord, - this, - fluidInput.amount)); + FluidEvent.fireEvent( + new FluidEvent.FluidFillingEvent( + fluidInput, + tile.getWorldObj(), + tile.xCoord, + tile.yCoord, + tile.zCoord, + this, + fluidInput.amount)); } return fluidInput.amount; @@ -567,8 +564,15 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT } if (tile != null) { - FluidEvent.fireEvent(new FluidEvent.FluidFillingEvent( - fluidInput, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, this, fluidInput.amount)); + FluidEvent.fireEvent( + new FluidEvent.FluidFillingEvent( + fluidInput, + tile.getWorldObj(), + tile.xCoord, + tile.yCoord, + tile.zCoord, + this, + fluidInput.amount)); } return filled; @@ -596,8 +600,15 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT } if (this != null) { - FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent( - fluidOutput, this.worldObj, this.xCoord, this.yCoord, this.zCoord, this, fluidOutput.amount)); + FluidEvent.fireEvent( + new FluidEvent.FluidDrainingEvent( + fluidOutput, + this.worldObj, + this.xCoord, + this.yCoord, + this.zCoord, + this, + fluidOutput.amount)); } } @@ -619,7 +630,16 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT if (this.hasDemonBlood() && !worldObj.isRemote) { SpellHelper.sendIndexedParticleToAllAround( - worldObj, xCoord, yCoord, zCoord, 20, worldObj.provider.dimensionId, 1, xCoord, yCoord, zCoord); + worldObj, + xCoord, + yCoord, + zCoord, + 20, + worldObj.provider.dimensionId, + 1, + xCoord, + yCoord, + zCoord); } if (this.lockdownDuration > 0) { @@ -643,8 +663,8 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT } if (AlchemicalWizardry.lockdownAltar) { - List list = - SpellHelper.getPlayersInRange(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 15, 15); + List list = SpellHelper + .getPlayersInRange(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 15, 15); for (EntityPlayer player : list) { PotionEffect regenEffect = player.getActivePotionEffect(Potion.regeneration); if (regenEffect != null && regenEffect.getAmplifier() >= 2) { @@ -654,8 +674,8 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT } if (AlchemicalWizardry.causeHungerWithRegen) { - List list = - SpellHelper.getPlayersInRange(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 15, 15); + List list = SpellHelper + .getPlayersInRange(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 15, 15); for (EntityPlayer player : list) { PotionEffect regenEffect = player.getActivePotionEffect(Potion.regeneration); if (regenEffect != null && regenEffect.getAmplifier() > 0) { @@ -798,7 +818,9 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT fluid.amount); int drain = SoulNetworkHandler.addCurrentEssenceToMaximum( - ownerName, liquidDrained, (int) (item.getMaxEssence() * this.orbCapacityMultiplier)); + ownerName, + liquidDrained, + (int) (item.getMaxEssence() * this.orbCapacityMultiplier)); fluid.amount = fluid.amount - drain; @@ -857,8 +879,10 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT if (intData.length == 3) { for (int i = 0; i < 1; i++) { if (intData[i * 3 + 2] != 0) { - ItemStack is = - new ItemStack(Item.getItemById(intData[i * 3]), intData[i * 3 + 2], intData[i * 3 + 1]); + ItemStack is = new ItemStack( + Item.getItemById(intData[i * 3]), + intData[i * 3 + 2], + intData[i * 3 + 1]); inv[i] = is; } else { inv[i] = null; @@ -998,7 +1022,7 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT public FluidTankInfo[] getTankInfo(ForgeDirection from) { FluidTank compositeTank = new FluidTank(capacity); compositeTank.setFluid(fluid); - return new FluidTankInfo[] {compositeTank.getInfo()}; + return new FluidTankInfo[] { compositeTank.getInfo() }; } public int[] buildFluidList() { @@ -1032,28 +1056,42 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT } public void sendChatInfoToPlayer(EntityPlayer player) { - player.addChatMessage(new ChatComponentText( - StatCollector.translateToLocal("message.altarEssence") + " " + this.fluid.amount + "LP")); - player.addChatMessage(new ChatComponentText( - StatCollector.translateToLocal("message.altarCurrentTier") + " " + this.upgradeLevel)); - player.addChatMessage(new ChatComponentText( - StatCollector.translateToLocal("message.capacity") + " " + this.getCapacity() + "LP")); + player.addChatMessage( + new ChatComponentText( + StatCollector.translateToLocal("message.altarEssence") + " " + this.fluid.amount + "LP")); + player.addChatMessage( + new ChatComponentText( + StatCollector.translateToLocal("message.altarCurrentTier") + " " + this.upgradeLevel)); + player.addChatMessage( + new ChatComponentText( + StatCollector.translateToLocal("message.capacity") + " " + this.getCapacity() + "LP")); } public void sendMoreChatInfoToPlayer(EntityPlayer player) { if (getStackInSlot(0) != null) { int stackSize = getStackInSlot(0).stackSize; - player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.altarProgress") + " " - + progress + "LP/" + liquidRequired * stackSize + "LP")); - player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.consumptionRate") + " " - + (int) (consumptionRate * (1 + consumptionMultiplier)) + "LP/t")); + player.addChatMessage( + new ChatComponentText( + StatCollector.translateToLocal("message.altarProgress") + " " + + progress + + "LP/" + + liquidRequired * stackSize + + "LP")); + player.addChatMessage( + new ChatComponentText( + StatCollector.translateToLocal("message.consumptionRate") + " " + + (int) (consumptionRate * (1 + consumptionMultiplier)) + + "LP/t")); } - player.addChatMessage(new ChatComponentText( - StatCollector.translateToLocal("message.altarEssence") + " " + this.fluid.amount + "LP")); - player.addChatMessage(new ChatComponentText( - StatCollector.translateToLocal("message.inputTank") + " " + this.fluidInput.amount + "LP")); - player.addChatMessage(new ChatComponentText( - StatCollector.translateToLocal("message.outputTank") + " " + this.fluidOutput.amount + "LP")); + player.addChatMessage( + new ChatComponentText( + StatCollector.translateToLocal("message.altarEssence") + " " + this.fluid.amount + "LP")); + player.addChatMessage( + new ChatComponentText( + StatCollector.translateToLocal("message.inputTank") + " " + this.fluidInput.amount + "LP")); + player.addChatMessage( + new ChatComponentText( + StatCollector.translateToLocal("message.outputTank") + " " + this.fluidOutput.amount + "LP")); } @Override diff --git a/src/main/java/com/arc/bloodarsenal/common/tileentity/container/ContainerPortableAltar.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/container/ContainerPortableAltar.java index 4ee8b74..b8cc227 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tileentity/container/ContainerPortableAltar.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/container/ContainerPortableAltar.java @@ -1,13 +1,15 @@ package com.arc.bloodarsenal.common.tileentity.container; -import com.arc.bloodarsenal.common.tileentity.TilePortableAltar; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import com.arc.bloodarsenal.common.tileentity.TilePortableAltar; + public class ContainerPortableAltar extends Container { + protected TilePortableAltar tileEntity; public ContainerPortableAltar(InventoryPlayer inventoryPlayer, TilePortableAltar te) { diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalModifiers.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalModifiers.java index 230ece4..929cf09 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalModifiers.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalModifiers.java @@ -2,12 +2,16 @@ package com.arc.bloodarsenal.common.tinkers; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; + import tconstruct.library.crafting.ModifyBuilder; public class BloodArsenalModifiers { + public static void initModifiers() { - ItemStack masterOrb = - new ItemStack(WayofTime.alchemicalWizardry.ModItems.masterBloodOrb, 1, OreDictionary.WILDCARD_VALUE); - ModifyBuilder.registerModifier(new ModSoulbound(new ItemStack[] {masterOrb})); + ItemStack masterOrb = new ItemStack( + WayofTime.alchemicalWizardry.ModItems.masterBloodOrb, + 1, + OreDictionary.WILDCARD_VALUE); + ModifyBuilder.registerModifier(new ModSoulbound(new ItemStack[] { masterOrb })); } } diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalTinkers.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalTinkers.java index 17efa55..f0066a8 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalTinkers.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalTinkers.java @@ -1,12 +1,5 @@ package com.arc.bloodarsenal.common.tinkers; -import com.arc.bloodarsenal.common.BloodArsenal; -import com.arc.bloodarsenal.common.BloodArsenalConfig; -import com.arc.bloodarsenal.common.block.ModBlocks; -import com.arc.bloodarsenal.common.items.ModItems; -import cpw.mods.fml.common.event.FMLInterModComms; -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; @@ -14,12 +7,23 @@ 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.crafting.FluidType; import tconstruct.library.crafting.Smeltery; import tconstruct.smeltery.TinkerSmeltery; +import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenalConfig; +import com.arc.bloodarsenal.common.block.ModBlocks; +import com.arc.bloodarsenal.common.items.ModItems; + +import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BloodArsenalTinkers { + public static final BloodArsenalTinkers INSTANCE = new BloodArsenalTinkers(); public static Fluid bloodInfusedIronFluid; @@ -116,20 +120,18 @@ public class BloodArsenalTinkers { 850, new FluidStack(bloodInfusedIronFluid, 144)); ItemStack ingotcast = new ItemStack(TinkerSmeltery.metalPattern, 1, 0); - TConstructRegistry.getBasinCasting() - .addCastingRecipe( - new ItemStack(ModBlocks.blood_infused_iron_block, 1), - new FluidStack(bloodInfusedIronFluid, 1296), - null, - true, - 100); - TConstructRegistry.getTableCasting() - .addCastingRecipe( - new ItemStack(ModItems.blood_infused_iron, 1), - new FluidStack(bloodInfusedIronFluid, 144), - ingotcast, - false, - 50); + TConstructRegistry.getBasinCasting().addCastingRecipe( + new ItemStack(ModBlocks.blood_infused_iron_block, 1), + new FluidStack(bloodInfusedIronFluid, 1296), + null, + true, + 100); + TConstructRegistry.getTableCasting().addCastingRecipe( + new ItemStack(ModItems.blood_infused_iron, 1), + new FluidStack(bloodInfusedIronFluid, 144), + ingotcast, + false, + 50); tag = new NBTTagCompound(); tag.setString("FluidName", bloodInfusedIronFluid.getName()); tag.setInteger("MaterialId", id); @@ -140,6 +142,7 @@ public class BloodArsenalTinkers { tag.setInteger("Value", 2); FMLInterModComms.sendMessage("TConstruct", "addMaterialItem", tag); BloodArsenal.proxy.executeClientCode(new IClientCode() { + @SideOnly(Side.CLIENT) public void executeClientCode() { (new TextureResourcePackBloodInfusedIron("BloodInfusedIron")).register(); @@ -151,9 +154,7 @@ public class BloodArsenalTinkers { static { MinecraftForge.EVENT_BUS.register(new TConEvents()); - bloodInfusedIronFluid = new Fluid("molten.blood_infused_iron") - .setDensity(3000) - .setViscosity(6000) + bloodInfusedIronFluid = new Fluid("molten.blood_infused_iron").setDensity(3000).setViscosity(6000) .setTemperature(1400); } } diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/IClientCode.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/IClientCode.java index 86c1ee6..fdf71c9 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/IClientCode.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/IClientCode.java @@ -4,6 +4,7 @@ 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/common/tinkers/ModSoulbound.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/ModSoulbound.java index 99a5f55..71757df 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/ModSoulbound.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/ModSoulbound.java @@ -1,14 +1,16 @@ package com.arc.bloodarsenal.common.tinkers; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; -import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; + import tconstruct.library.modifier.IModifyable; import tconstruct.modifiers.tools.ModBoolean; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; public class ModSoulbound extends ModBoolean { + public int modifiersRequired = 1; private String owner; diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java index b5ad6d0..e352787 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java @@ -1,11 +1,13 @@ package com.arc.bloodarsenal.common.tinkers; +import net.minecraftforge.client.event.TextureStitchEvent; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraftforge.client.event.TextureStitchEvent; public class TConEvents { + @SideOnly(Side.CLIENT) @SubscribeEvent public void handleStich(TextureStitchEvent.Pre event) { diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBase.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBase.java index 89e051b..e1d56b5 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBase.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBase.java @@ -1,9 +1,5 @@ package com.arc.bloodarsenal.common.tinkers; -import com.arc.bloodarsenal.common.BloodArsenal; -import com.google.common.base.Throwables; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.ObfuscationReflectionHelper; import java.awt.image.BufferedImage; import java.awt.image.DirectColorModel; import java.io.ByteArrayInputStream; @@ -11,14 +7,23 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.util.*; + import javax.imageio.ImageIO; + 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 com.arc.bloodarsenal.common.BloodArsenal; +import com.google.common.base.Throwables; + +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.common.ObfuscationReflectionHelper; + public abstract class TextureResourcePackBase implements IResourcePack, IResourceManagerReloadListener { + public static List packs; protected static DirectColorModel rgb = new DirectColorModel(32, 16711680, '\uff00', 255, -16777216); protected final String name; @@ -43,15 +48,17 @@ public abstract class TextureResourcePackBase implements IResourcePack, IResourc List packs = this.getiResourcePacks(); packs.add(this); ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(this); - BloodArsenal.logger.info("Registered TCon Resource Pack (" + this.name + ") - " - + this.getClass().getSimpleName()); + BloodArsenal.logger + .info("Registered TCon Resource Pack (" + this.name + ") - " + this.getClass().getSimpleName()); } public List getiResourcePacks() { List packs1 = packs; if (packs1 == null) { packs1 = (List) ObfuscationReflectionHelper.getPrivateValue( - FMLClientHandler.class, FMLClientHandler.instance(), new String[] {"resourcePackList"}); + FMLClientHandler.class, + FMLClientHandler.instance(), + new String[] { "resourcePackList" }); } return packs1; @@ -66,8 +73,7 @@ public abstract class TextureResourcePackBase implements IResourcePack, IResourc if (iResourcePack.resourceExists(location)) { try { stream = iResourcePack.getInputStream(location); - } catch (IOException var6) { - } + } catch (IOException var6) {} } } @@ -96,18 +102,17 @@ public abstract class TextureResourcePackBase implements IResourcePack, IResourc public InputStream getInputStream(ResourceLocation p_110590_1_) throws IOException { byte[] bytes = (byte[]) this.cachedImages.get(p_110590_1_); if (bytes == null) { - ResourceLocation location = - new ResourceLocation("tinker", p_110590_1_.getResourcePath().replace(this.name, "")); + ResourceLocation location = new ResourceLocation( + "tinker", + p_110590_1_.getResourcePath().replace(this.name, "")); InputStream inputStream = this.getStream(location); if (inputStream == null) { - location = new ResourceLocation( - "tinker", p_110590_1_.getResourcePath().replace(this.name, "iron")); + location = new ResourceLocation("tinker", p_110590_1_.getResourcePath().replace(this.name, "iron")); inputStream = this.getStream(location); } if (inputStream == null) { - location = new ResourceLocation( - "tinker", p_110590_1_.getResourcePath().replace(this.name, "stone")); + location = new ResourceLocation("tinker", p_110590_1_.getResourcePath().replace(this.name, "stone")); inputStream = this.getStream(location); } @@ -147,16 +152,18 @@ public abstract class TextureResourcePackBase implements IResourcePack, IResourc } else { String resourcePath = p_110589_1_.getResourcePath(); return resourcePath.startsWith("textures/items/") && resourcePath.endsWith(".png") - ? (this.delegate.resourceExists(p_110589_1_) - ? false - : (!resourcePath.contains(this.name) - ? false - : this.delegate.resourceExists(new ResourceLocation( - "tinker", resourcePath.replace(this.name, "stone"))) - || this.delegate.resourceExists(new ResourceLocation( - "tinker", resourcePath.replace(this.name, "iron"))) - || this.delegate.resourceExists(new ResourceLocation( - "tinker", resourcePath.replace(this.name, ""))))) + ? (this.delegate.resourceExists(p_110589_1_) ? false + : (!resourcePath.contains(this.name) ? false + : this.delegate.resourceExists( + new ResourceLocation("tinker", resourcePath.replace(this.name, "stone"))) + || this.delegate.resourceExists( + new ResourceLocation( + "tinker", + resourcePath.replace(this.name, "iron"))) + || this.delegate.resourceExists( + new ResourceLocation( + "tinker", + resourcePath.replace(this.name, ""))))) : false; } } diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBloodInfusedIron.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBloodInfusedIron.java index a9f2790..8708e4e 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBloodInfusedIron.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBloodInfusedIron.java @@ -1,10 +1,13 @@ package com.arc.bloodarsenal.common.tinkers; import java.awt.image.BufferedImage; + import net.minecraft.util.MathHelper; public class TextureResourcePackBloodInfusedIron extends TextureResourcePackBase { - static int[][] offsets = new int[][] {{0, 1}, {1, 1}, {1, 0}, {1, -1}, {0, -1}, {-1, -1}, {-1, 0}, {-1, 1}}; + + static int[][] offsets = new int[][] { { 0, 1 }, { 1, 1 }, { 1, 0 }, { 1, -1 }, { 0, -1 }, { -1, -1 }, { -1, 0 }, + { -1, 1 } }; public TextureResourcePackBloodInfusedIron(String name) { super(name); @@ -51,8 +54,8 @@ public class TextureResourcePackBloodInfusedIron extends TextureResourcePackBase boolean[][] interior2 = this.contract(var28, 2 * var26); boolean[][] interior3 = this.contract(interior2, var26); boolean[][] interior4 = this.contract(interior3, var26); - boolean[][] interiorCorners = - this.multI(this.mult(this.expand(this.getCorners(interior2), var26), interior2), interior3); + boolean[][] interiorCorners = this + .multI(this.mult(this.expand(this.getCorners(interior2), var26), interior2), interior3); boolean[][] interiorCornersShift = this.orwise( this.orwise(this.shift(interiorCorners, -1, 0), this.shift(interiorCorners, 0, -1)), this.shift(interiorCorners, -1, -1)); @@ -143,8 +146,7 @@ public class TextureResourcePackBloodInfusedIron extends TextureResourcePackBase } public int multPixel(int col, int b) { - return -16777216 - | this.clamp(rgb.getRed(col) * b / 255) << 16 + return -16777216 | this.clamp(rgb.getRed(col) * b / 255) << 16 | this.clamp(rgb.getGreen(col) * b / 255) << 8 | this.clamp(rgb.getBlue(col) * b / 255); }