diff --git a/build.properties b/build.properties index 77fc573..1e973a8 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ mod_name=BloodArsenal package_group=com.arc.bloodarsenal -mod_version=1.1 +mod_version=1.2 mc_version=1.7.10 ccLib_version=1.1.3.138 @@ -12,4 +12,4 @@ forgeMultipart_version=1.2.0.345 waila_version=1.5.11-RC2-NONEI forge_version=10.13.4.1481 -build_number=14 +build_number=0 diff --git a/src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java b/src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java index 903c1a5..425b044 100644 --- a/src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java +++ b/src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java @@ -167,7 +167,7 @@ public class BloodArsenal { logger.info("Loaded Thaumcraft/Forbidden Magic integration"); ModItems.registerThaumcraftItems(); - BloodArsenalThaumcraft.init(); + BloodArsenalThaumcraft.addResearch(); } if (Loader.isModLoaded("ForgeMultipart") && BloodArsenalConfig.forgeMultipartIntegration) diff --git a/src/main/java/com/arc/bloodarsenal/common/BloodArsenalEventHooks.java b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalEventHooks.java index cab35c6..1ae3533 100644 --- a/src/main/java/com/arc/bloodarsenal/common/BloodArsenalEventHooks.java +++ b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalEventHooks.java @@ -244,75 +244,4 @@ public class BloodArsenalEventHooks BloodArsenal.logger.info("Refreshing configuration file"); } } - - @Optional.Method(modid = "Baubles") - @SubscribeEvent - private void selfSacrificeHandler(LivingAttackEvent event) - { - EntityLivingBase entityAttacked = event.entityLiving; - float damageDone = event.ammount; - - EntityPlayer player = (EntityPlayer) entityAttacked; - InventoryBaubles inv = PlayerHandler.getPlayerBaubles(player); - - for (int i = 0; i < inv.getSizeInventory(); i++) - { - ItemStack stack = inv.getStackInSlot(i); - - if (stack != null) - { - if (stack.getItem() == ModItems.self_sacrifice_amulet) - { - SelfSacrificeAmulet selfSacrificeAmulet = (SelfSacrificeAmulet) ModItems.self_sacrifice_amulet; - int lpReceived = (int) damageDone; - boolean shouldExecute = selfSacrificeAmulet.getStoredLP(stack) < 10000; - - if (shouldExecute) - { - PotionEffect regenEffect = player.getActivePotionEffect(Potion.regeneration); - - if (regenEffect != null && regenEffect.getAmplifier() >= 2) - { - selfSacrificeAmulet.setStoredLP(stack, Math.min(selfSacrificeAmulet.getStoredLP(stack) + (lpReceived * 2) / (regenEffect.getAmplifier() + 1), 10000)); - } - else - { - selfSacrificeAmulet.setStoredLP(stack, Math.min(selfSacrificeAmulet.getStoredLP(stack) + (lpReceived * 2), 10000)); - } - } - -// if (player instanceof EntityPlayerMP) - { - PacketHandler.INSTANCE.sendTo(new PacketSyncBauble(player, i), (EntityPlayerMP) player); - } - } - - if (stack.getItem() == ModItems.empowered_self_sacrifice_amulet) - { - EmpoweredSelfSacrificeAmulet selfSacrificeAmulet = (EmpoweredSelfSacrificeAmulet) ModItems.empowered_self_sacrifice_amulet; - int lpReceived = (int) damageDone; - boolean shouldExecute = selfSacrificeAmulet.getStoredLP(stack) < 50000; - - if (shouldExecute) - { - PotionEffect regenEffect = player.getActivePotionEffect(Potion.regeneration); - - if (regenEffect != null && regenEffect.getAmplifier() >= 2) - { - selfSacrificeAmulet.setStoredLP(stack, Math.min(selfSacrificeAmulet.getStoredLP(stack) + (lpReceived * 5) / (regenEffect.getAmplifier() + 1), 50000)); - } - else - { - selfSacrificeAmulet.setStoredLP(stack, Math.min(selfSacrificeAmulet.getStoredLP(stack) + (lpReceived * 5), 50000)); - } - } - -// if (player instanceof EntityPlayerMP) - { - PacketHandler.INSTANCE.sendTo(new PacketSyncBauble(player, i), (EntityPlayerMP) player); - } - } - } - } - } } 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 9e1af3c..6732f36 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 @@ -9,11 +9,8 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import baubles.common.network.PacketHandler; -import baubles.common.network.PacketSyncBauble; import com.arc.bloodarsenal.common.BloodArsenalConfig; import com.arc.bloodarsenal.common.items.ModItems; -import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -30,6 +27,7 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.living.LivingDeathEvent; import java.util.List; @@ -49,7 +47,7 @@ public class EmpoweredSacrificeAmulet extends SacrificeAmulet implements IBauble { Entity killer = event.source.getEntity(); - if (killer != null && killer instanceof EntityPlayer && BloodArsenalConfig.baublesIntegration) + if (killer != null && killer instanceof EntityPlayerMP && !(killer instanceof FakePlayer) && BloodArsenalConfig.baublesIntegration) { EntityLivingBase victim = event.entityLiving; 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 b71ac26..a24ce2b 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 @@ -9,8 +9,6 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import baubles.common.network.PacketHandler; -import baubles.common.network.PacketSyncBauble; import com.arc.bloodarsenal.common.BloodArsenalConfig; import com.arc.bloodarsenal.common.items.ModItems; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -51,7 +49,7 @@ public class EmpoweredSelfSacrificeAmulet extends SelfSacrificeAmulet implements EntityLivingBase entityAttacked = event.entityLiving; Entity entityAttacking = event.source.getSourceOfDamage(); - if (entityAttacking != null && entityAttacked != null && entityAttacked instanceof EntityPlayer && BloodArsenalConfig.baublesIntegration) + if (entityAttacking != null && entityAttacked != null && entityAttacked instanceof EntityPlayerMP && BloodArsenalConfig.baublesIntegration) { float damageDone = event.ammount; 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 74704e9..aee9f1e 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 @@ -6,11 +6,8 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import baubles.common.network.PacketHandler; -import baubles.common.network.PacketSyncBauble; import com.arc.bloodarsenal.common.BloodArsenalConfig; import com.arc.bloodarsenal.common.items.ModItems; -import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -27,6 +24,7 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.living.LivingDeathEvent; import java.util.List; @@ -44,7 +42,7 @@ public class SacrificeAmulet extends ItemBauble implements IAltarManipulator, IB { Entity killer = event.source.getEntity(); - if (killer != null && killer instanceof EntityPlayer && BloodArsenalConfig.baublesIntegration) + if (killer != null && killer instanceof EntityPlayerMP && !(killer instanceof FakePlayer) && BloodArsenalConfig.baublesIntegration) { EntityLivingBase victim = event.entityLiving; 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 53c0aae..46352e8 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 @@ -6,15 +6,12 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import baubles.common.network.PacketHandler; -import baubles.common.network.PacketSyncBauble; 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 net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -45,7 +42,7 @@ public class SelfSacrificeAmulet extends ItemBauble implements IAltarManipulator { EntityLivingBase entityAttacked = event.entityLiving; - if (entityAttacked != null && entityAttacked instanceof EntityPlayer && BloodArsenalConfig.baublesIntegration) + 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 1d17097..8db03b8 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 @@ -8,7 +8,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; @@ -26,7 +26,7 @@ public class VampireRing extends ItemBauble implements IBauble { super.onWornTick(par1ItemStack, player); - if (player instanceof EntityPlayer && !player.worldObj.isRemote) + if (player instanceof EntityPlayerMP && !player.worldObj.isRemote) { if (player.getActivePotionEffect(BloodArsenal.vampiricAura) != null) { 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 318f85e..f7ccf09 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 @@ -27,6 +27,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import java.util.List; +import java.util.Random; public class GlassDaggerOfSacrifice extends EnergyItems { @@ -74,10 +75,13 @@ public class GlassDaggerOfSacrifice extends EnergyItems } int lifeEssence = 500; - if (par2EntityLivingBase instanceof EntityVillager) lifeEssence = 3000; - else if (par2EntityLivingBase instanceof EntitySlime) lifeEssence = 225; + Random random = new Random(); + + if (random.nextInt(3) == 2) lifeEssence = 100; + else if (par2EntityLivingBase instanceof EntityVillager) lifeEssence = 2500; + else if (par2EntityLivingBase instanceof EntitySlime) lifeEssence = 200; else if (par2EntityLivingBase instanceof EntityEnderman) lifeEssence = 300; - else if (par2EntityLivingBase instanceof EntityAnimal) lifeEssence = 375; + else if (par2EntityLivingBase instanceof EntityAnimal) lifeEssence = 350; if (findAndFillAltar(par2EntityLivingBase.worldObj, par2EntityLivingBase, lifeEssence)) { 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 2ce7486..78644df 100644 --- a/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodArsenalThaumcraft.java +++ b/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodArsenalThaumcraft.java @@ -1,9 +1,43 @@ +/** + * 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; +import thaumcraft.api.crafting.InfusionRecipe; +import thaumcraft.api.research.ResearchPage; +import thaumcraft.api.wands.StaffRod; +import thaumcraft.api.wands.WandCap; +import thaumcraft.api.wands.WandRod; + public class BloodArsenalThaumcraft { - public static void init() + public static void addResearch() { - BloodyResearch.addResearch(); + final String FORBIDDEN = "FORBIDDEN"; + + WandRod bloodRod = WandRod.rods.get("blood"); + WandCap alchemicalCap = WandCap.caps.get("alchemical"); + WandRod bloodStaff = StaffRod.rods.get("blood"); + + InfusionRecipe rod_blood_wood = ThaumcraftApi.addInfusionCraftingRecipe("ROD_blood_wood", new ItemStack(ModItems.wandCore, 1, 0), 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 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(); + ThaumcraftApi.addWarpToResearch("ROD_blood_wood", 2); + ThaumcraftApi.addWarpToItem(new ItemStack(ModItems.wandCore, 1, 0), 2); + InfusionRecipe cap_blood_iron = ThaumcraftApi.addInfusionCraftingRecipe("CAP_blood_iron", new ItemStack(ModItems.wandCap, 1, 0), 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 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(); + 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).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 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(); + 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/BloodyResearch.java b/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodyResearch.java deleted file mode 100644 index 8a6ad51..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/thaumcraft/BloodyResearch.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * 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; -import thaumcraft.api.crafting.InfusionRecipe; -import thaumcraft.api.research.ResearchPage; -import thaumcraft.api.wands.WandCap; -import thaumcraft.api.wands.WandRod; - -public class BloodyResearch -{ - public BloodyResearch() {} - - public static void addResearch() - { - final String FORBIDDEN = "FORBIDDEN"; - - WandRod bloodRod = WandRod.rods.get("blood"); - WandCap alchemicalCap = WandCap.caps.get("alchemical"); - - InfusionRecipe rod_blood_wood = ThaumcraftApi.addInfusionCraftingRecipe("ROD_blood_wood", new ItemStack(ModItems.wandCore, 1, 0), 3, (new AspectList()).add(Aspect.LIFE, 24).add(Aspect.MAGIC, 16).add(Aspect.TOOL, 8), 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 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(); - InfusionRecipe cap_blood_iron = ThaumcraftApi.addInfusionCraftingRecipe("CAP_blood_iron", new ItemStack(ModItems.wandCap, 1, 0), 3, (new AspectList()).add(Aspect.LIFE, 16).add(Aspect.WATER, 8).add(Aspect.MAGIC, 8), 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 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(); - } -} 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 548c7a3..4b02673 100644 --- a/src/main/java/com/arc/bloodarsenal/common/thaumcraft/ItemWandCores.java +++ b/src/main/java/com/arc/bloodarsenal/common/thaumcraft/ItemWandCores.java @@ -22,7 +22,7 @@ import java.util.List; public class ItemWandCores extends Item { - public final String[] types = new String[]{"blood_wood"}; + 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/TileLifeInfuser.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLifeInfuser.java index a271e08..2b13d8c 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLifeInfuser.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLifeInfuser.java @@ -31,6 +31,8 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan private boolean canBeFilled; protected FluidStack fluidInput; + private int bufferCapacity; + public FluidTank[] tanks = {new FluidTankRestricted(FluidContainerRegistry.BUCKET_VOLUME * 20, "Life Essence")}; public TileLifeInfuser() @@ -39,6 +41,8 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan fluid = new FluidStack(AlchemicalWizardry.lifeEssenceFluid, 0); fluidInput = new FluidStack(AlchemicalWizardry.lifeEssenceFluid, 0); this.capacity = FluidContainerRegistry.BUCKET_VOLUME * 20; + + bufferCapacity = FluidContainerRegistry.BUCKET_VOLUME; } @Override @@ -77,6 +81,7 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan canBeFilled = par1NBTTagCompound.getBoolean("canBeFilled"); capacity = par1NBTTagCompound.getInteger("capacity"); + bufferCapacity = par1NBTTagCompound.getInteger("bufferCapacity"); } @Override @@ -115,6 +120,7 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan par1NBTTagCompound.setTag("Inventory", itemList); par1NBTTagCompound.setBoolean("canBeFilled", canBeFilled); par1NBTTagCompound.setInteger("capacity", capacity); + par1NBTTagCompound.setInteger("bufferCapacity", bufferCapacity); } @Override @@ -419,7 +425,7 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan { if (fluidInput == null) { - return Math.min(capacity, resource.amount); + return Math.min(bufferCapacity, resource.amount); } if (!fluidInput.isFluidEqual(resource)) @@ -427,7 +433,7 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan return 0; } - return Math.min(capacity - fluidInput.amount, resource.amount); + return Math.min(bufferCapacity - fluidInput.amount, resource.amount); } if (fluidInput == null) @@ -447,13 +453,17 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan return 0; } - int filled = capacity - fluidInput.amount; + int filled = bufferCapacity - fluidInput.amount; if (resource.amount < filled) { fluidInput.amount += resource.amount; filled = resource.amount; } + else + { + fluidInput.amount = bufferCapacity; + } if (tile != null) { 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 1d39b4b..a35e90b 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tileentity/TilePortableAltar.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/TilePortableAltar.java @@ -602,9 +602,10 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT if (fluidInput == null) { fluidInput = new FluidStack(resource, Math.min(bufferCapacity, resource.amount)); + if (tile != null) { - FluidEvent.fireEvent(new FluidEvent.FluidFillingEvent(fluidInput, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, this)); + FluidEvent.fireEvent(new FluidEvent.FluidFillingEvent(fluidInput, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, this, fluidInput.amount)); } return fluidInput.amount; @@ -629,7 +630,7 @@ 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)); + FluidEvent.fireEvent(new FluidEvent.FluidFillingEvent(fluidInput, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, this, fluidInput.amount)); } return filled; @@ -663,7 +664,7 @@ 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)); + FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(fluidOutput, this.worldObj, this.xCoord, this.yCoord, this.zCoord, this, fluidOutput.amount)); } } diff --git a/src/main/resources/assets/bloodarsenal/lang/en_US.lang b/src/main/resources/assets/bloodarsenal/lang/en_US.lang index 6148019..fdefe64 100644 --- a/src/main/resources/assets/bloodarsenal/lang/en_US.lang +++ b/src/main/resources/assets/bloodarsenal/lang/en_US.lang @@ -96,6 +96,18 @@ item.life_imbued_helmet.name=Life Imbued Helmet item.life_imbued_chestplate.name=Life Imbued Chestplate item.life_imbued_leggings.name=Life Imbued Leggings item.life_imbued_boots.name=Life Imbued Boots +item.bound_diamond_shard_.name=Bound Diamond Shard +item.bound_diamond_shard_air.name=Bound Diamond Air Shard +item.bound_diamond_shard_earth.name=Bound Diamond Earth Shard +item.bound_diamond_shard_fire.name=Bound Diamond Fire Shard +item.bound_diamond_shard_water.name=Bound Diamond Water Shard +item.bound_diamond_shard_dusk.name=Bound Diamond Dusk Shard +item.bound_diamond_shard_dawn.name=Bound Diamond Dawn Shard +item.wand_caps.blood_iron.name=Blood Infused Iron Cap +item.wand_cores.blood_wood.name=Blood Infused Wooden Rod +item.wand_cores.blood_wood_staff.name=Blood Infused Wooden Staff Of Doom +item.Wand.blood_iron.cap=Blood Iron Topped +item.Wand.blood_wood.rod=Blood Wood #Death Texts death.attack.deathFromBlood=%1$s lost too much blood @@ -140,6 +152,7 @@ tooltip.sigil.augmentedHolding=Hold all the sigils! tooltip.sigil.lightning=Let 'er rip! tooltip.sigil.lightning2=Mode: tooltip.bloodMoney.money=Pay your debts in blood! +tooltip.boundDiamondShard.shard=Elemental shards of doom tooltip.armor.glassArmor=More painful than it looks tooltip.armor.lifeImbuedArmor=Living Armor tooltip.energybattery.currentLP=Current LP: @@ -194,7 +207,7 @@ message.enchant.noPedestals=There are no pedestals! message.enchant.noEnchantItem=There is no item to enchant! message.enchant.noEnchantments=There are no enchantments to apply! message.enchant.notEnoughLP=You do not have enough LP! -message.enchant.enchantIsNotValid=The enchantment is not valid for the item +message.enchant.The enchantment is not valid for the item message.tile.contains=Contains: @@ -207,8 +220,8 @@ message.inputTank=Input tank: message.outputTank=Output tank: #Miscs -ba.versioning.outdated=You are using Blood Arsenal %s, the latest is %s. -ba.versioning.updateMessage=["Click to: [",{"text":"Download","color":"red","hoverEvent":{"action":"show_text","value":{"text":"Click this to auto-magically download the latest version","color":"red"}},"clickEvent":{"action":"run_command","value":"/bloodarsenal-download-latest %version%"}},"] [",{"text":"Website","color":"red","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the website","color":"red"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/mc-mods/228823-blood-magic-addon-blood-arsenal/files"}},"] [",{"text":"Changelog","color":"red","hoverEvent":{"action":"show_text","value":{"text":"Click this to go see the changelog","color":"red"}},"clickEvent":{"action":"open_url","value":"http://www.curse.com/mc-mods/minecraft/228823-blood-magic-addon-blood-arsenal#t1:changes"}},"]"] +ba.versioning.outdated=You are using Blood Arsenal %s; the latest is %s. +ba.versioning.updateMessage=["Click to [",{"text":"Download","color":"red","hoverEvent":{"action":"show_text","value":{"text":"Click this to auto-magically download the latest version","color":"red"}},"clickEvent":{"action":"run_command","value":"/bloodarsenal-download-latest %version%"}},"] [",{"text":"Website","color":"red","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the website","color":"red"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/mc-mods/228823-blood-magic-addon-blood-arsenal/files"}},"] [",{"text":"Changelog","color":"red","hoverEvent":{"action":"show_text","value":{"text":"Click this to go see the changelog","color":"red"}},"clickEvent":{"action":"open_url","value":"http://www.curse.com/mc-mods/minecraft/228823-blood-magic-addon-blood-arsenal#t1:changes"}},"]"] ba.versioning.startingDownload=[{"text":"Starting download of %s Please do not remove your hard disk.", "color":"orange"},{"text":"Support Arcaratus","color":"cyan"},{"text":" on [","color":"orange"},{"text":"Patreon","color":"gold","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to Arcaratus's Patreon","color":"cyan"}},"clickEvent":{"action":"open_url","value":"http://www.patreon.com/Arcaratus"}},{"text":"]!","color":"orange"}] ba.versioning.doneDownloading=Finished downloading %s Delete your old Blood Arsenal .jar and reload your game to update. ba.versioning.error=An error has occurred while downloading the mod! @@ -224,3 +237,17 @@ material.bloodarsenal.blood_infused_iron=Blood Infused Iron fluid.molten.blood_infused_iron=Molten Blood Infused Iron modifier.toolstation.Soulbound=Soulbound + +#Thaumcraft Entries +blood_arsenal.research_name.CAP_blood_iron=Blood Infused Iron Caps +blood_arsenal.research_text.CAP_blood_iron=Imbued with life +blood_arsenal.research_page.CAP_blood_iron.1=Alchemical Caps were just the beginning. You know that like Blood Infused Wood, Blood Infused Iron also has regenerating properties so you have theorized a way to combine Blood Infused Iron into an Alchemical Cap making it...almost living! They give a better vis discount than the Alchemical Caps, and seem to be more efficient at consuming LP when combined with the Blood Infused Wooden Wand Rod. However, this regenerating property seems to be too much for a standard Blood Rod rendering it inert if put on a Blood Rod. +# +blood_arsenal.research_name.ROD_blood_wood=Blood Infused Wood Cores +blood_arsenal.research_text.ROD_blood_wood=Pulsating with life +blood_arsenal.research_page.ROD_blood_wood.1=Your works on the Blood Rods have led you to wonder if you can use the properties of Blood Infused Wood in the same manner as you have used the Blood Rods. Pondering on this thought, you realize that with a bit of catalyzing and some mystical infusing, that yes! It is indeed possible to upgrade a Blood Rod with Blood Infused Wood which grants it much higher regenerative vis capabilities. No wand has ever been so living! Recharging at twice the speed it was, you can fill the wand in no time. However there is one downside, it uses muuch more LP than the Blood Rod ever did. Even with Alchemical Caps, it still uses more than the Blood Rod. Desperate for a work-around, you wonder if you can +blood_arsenal.research_page.ROD_blood_wood.2=apply the same principles to Alchemical Caps... +# +blood_arsenal.research_name.ROD_blood_wood_staff=Blood Infused Wood Staff Core +blood_arsenal.research_text.ROD_blood_wood_staff=Bringing Doom to the party +blood_arsenal.research_page.ROD_blood_wood_staff.1=Even with your supremely regenerative wand and caps, you are still not yet satisfied. You know that when the Blood Rods are turned into Blood Staff Cores, they regenerate four times faster but holds half the amount of vis. Working with some dark magics and a Blood Staff Core, you can now create a living terror. This mighty staff regenerates 2 times faster than the Blood Staff but this is where the regenerative capabilities of Blood Infused Wood meet its limits: the wood itself seemingly tries to regenerate faster than it physically can. To compensate for this, it has to draw Life from the player every time it regenerates vis. And unlike the other blood wands, it doesn't care if you survive or not... \ No newline at end of file diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 13c5af6..4671a6b 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "BloodArsenal", "name": "Blood Arsenal", "description": "Blood-themed tools, weapons, armor and much more!", - "version": "1.1-14", + "version": "1.2-0", "mcversion": "1.7.10", "url": "", "updateUrl": "",