lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix Bound Tools having high damage while deactivated

Browse source
This commit is contained in:
Nick 2016-02-04 02:51:54 -08:00
parent cc66af7eb1
commit 352d2ab35c
5 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java
View file

@ -27,7 +27,7 @@ public class ItemBoundAxe extends ItemBoundTool
public ItemBoundAxe()
{
super("axe", 5, EFFECTIVE_ON);
super("axe", 7, 5, EFFECTIVE_ON);
setRegistryName(Constants.BloodMagicItem.BOUND_AXE.getRegName());
}

2
src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java
View file

@ -27,7 +27,7 @@ public class ItemBoundPickaxe extends ItemBoundTool
public ItemBoundPickaxe()
{
super("pickaxe", 5, EFFECTIVE_ON);
super("pickaxe", 5, 5, EFFECTIVE_ON);
setRegistryName(Constants.BloodMagicItem.BOUND_PICKAXE.getRegName());
}

2
src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java
View file

@ -27,7 +27,7 @@ public class ItemBoundShovel extends ItemBoundTool
public ItemBoundShovel()
{
super("shovel", 5, EFFECTIVE_ON);
super("shovel", 1, 5, EFFECTIVE_ON);
setRegistryName(Constants.BloodMagicItem.BOUND_SHOVEL.getRegName());
}

14
src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java
View file

@ -88,6 +88,20 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable
tooltip.add(TextHelper.localizeEffect("tooltip.BloodMagic.currentOwner", PlayerHelper.getUsernameFromStack(stack)));
}
@Override
public Multimap<String, AttributeModifier> getItemAttributeModifiers()
{
return HashMultimap.create();
}
@Override
public Multimap<String, AttributeModifier> getAttributeModifiers(ItemStack stack) {
Multimap<String, AttributeModifier> multimap = super.getAttributeModifiers(stack);
double damage = getActivated(stack) ? this.attackDamage : 1.0D;
multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(itemModifierUUID, "Weapon modifier", damage, 0));
return multimap;
}
public boolean getActivated(ItemStack stack)
{
NBTHelper.checkNBT(stack);

19
src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java
View file

@ -7,9 +7,12 @@ import java.util.Set;
import WayofTime.bloodmagic.api.iface.IActivatable;
import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import com.google.common.collect.Multimap;
import lombok.Getter;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
@ -36,13 +39,14 @@ public class ItemBoundTool extends ItemBindable implements IActivatable
private Set<Block> effectiveBlocks;
protected final String tooltipBase;
private final String name;
private final int damage;
public Map<ItemStack, Boolean> heldDownMap = new HashMap<ItemStack, Boolean>();
public Map<ItemStack, Integer> heldDownCountMap = new HashMap<ItemStack, Integer>();
public final int chargeTime = 30;
public ItemBoundTool(String name, int lpUsed, Set<Block> effectiveBlocks)
public ItemBoundTool(String name, int damage, int lpUsed, Set<Block> effectiveBlocks)
{
super();
setUnlocalizedName(Constants.Mod.MODID + ".bound." + name);
@ -51,11 +55,12 @@ public class ItemBoundTool extends ItemBindable implements IActivatable
this.name = name;
this.tooltipBase = "tooltip.BloodMagic.bound." + name + ".";
this.effectiveBlocks = effectiveBlocks;
this.damage = damage;
}
public ItemBoundTool(String name, int lpUsed)
public ItemBoundTool(String name, int damage, int lpUsed)
{
this(name, lpUsed, null);
this(name, damage, lpUsed, null);
}
@Override
@ -171,6 +176,14 @@ public class ItemBoundTool extends ItemBindable implements IActivatable
}
@Override
public Multimap<String, AttributeModifier> getAttributeModifiers(ItemStack stack) {
Multimap<String, AttributeModifier> multimap = super.getAttributeModifiers(stack);
double damage = getActivated(stack) ? this.damage : 1.0D;
multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(itemModifierUUID, "Weapon modifier", damage, 0));
return multimap;
}
@Override
public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityPlayer playerIn)
{