remove ItemTool subclassing
This commit is contained in:
parent
37f912cb6d
commit
acc43e2d42
24 changed files with 101 additions and 216 deletions
|
@ -30,7 +30,6 @@ import common.attributes.Attribute;
|
|||
import common.collect.Lists;
|
||||
import common.collect.Sets;
|
||||
import common.enchantment.Enchantment;
|
||||
import common.enchantment.EnchantmentHelper;
|
||||
import common.init.ItemRegistry;
|
||||
import common.inventory.Container;
|
||||
import common.inventory.InventoryPlayer;
|
||||
|
@ -142,15 +141,6 @@ public abstract class GuiContainer extends Gui
|
|||
}
|
||||
}
|
||||
|
||||
int damage = stack.getItem().getAttackDamageBonus();
|
||||
damage += EnchantmentHelper.getDamageModifier(stack);
|
||||
if(damage != 0) {
|
||||
if(damage > 0)
|
||||
list.add(Color.BLUE + String.format("+%d Angriffsschaden", damage));
|
||||
else
|
||||
list.add(Color.RED + String.format("-%d Angriffsschaden", damage));
|
||||
}
|
||||
|
||||
Map<Attribute, Float> mods = stack.getAttributeModifiers(null);
|
||||
|
||||
if(!mods.isEmpty()) {
|
||||
|
|
|
@ -900,11 +900,6 @@ public class ClientPlayer implements IClientPlayer
|
|||
{
|
||||
this.gm.effectRenderer.spawnCritParticles(entity);
|
||||
}
|
||||
else if (packetIn.getAnimationType() == 5)
|
||||
{
|
||||
this.gm.effectRenderer.spawnCritParticles(entity);
|
||||
this.gm.effectRenderer.spawnCritParticles(entity);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue