From 5ceceec6bbb66656648a137e5e711cc3db925790 Mon Sep 17 00:00:00 2001 From: Wire Segal Date: Sun, 3 Apr 2016 18:01:24 -0400 Subject: [PATCH] Various minor fixes * Fix Lexicon crashing with invalid version format Closes #192 * Fix crashing on damage taken Closes #196 * Fix attributes being too present/wrong values Closes #194 --- .../vazkii/botania/common/core/handler/PixieHandler.java | 2 +- src/main/java/vazkii/botania/common/item/ItemLexicon.java | 2 +- .../equipment/armor/terrasteel/ItemTerrasteelArmor.java | 8 +++++--- .../item/equipment/tool/manasteel/ItemManasteelAxe.java | 3 ++- .../item/equipment/tool/terrasteel/ItemTerraAxe.java | 1 + 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java index 7b37a4f33..5fd862300 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -58,7 +58,7 @@ public class PixieHandler { } float getChance(ItemStack stack) { - if(stack == null) + if(stack == null || !(stack.getItem() instanceof IPixieSpawner)) return 0F; else return ((IPixieSpawner) stack.getItem()).getPixieChance(stack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 3f0a773e4..36afced6c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -125,7 +125,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { public static String getEdition() { String version = LibMisc.BUILD; - int build = version.contains("GRADLE") ? 0 : Integer.parseInt(version); + int build = version.contains("GRADLE") ? 0 : Integer.parseInt(version.replace("[^\\d]", "")); return build == 0 ? I18n.translateToLocal("botaniamisc.devEdition") : MathHelper.numberToOrdinal(build); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index d5cc5ed6c..7da465c69 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -57,9 +57,11 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { @Override public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { - Multimap multimap = HashMultimap.create(); - UUID uuid = new UUID(getUnlocalizedName().hashCode(), 0); - multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getAttributeUnlocalizedName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) getArmorDisplay(null, new ItemStack(this), type.getIndex()) / 20, 0)); + Multimap multimap = super.getAttributeModifiers(slot, stack); + UUID uuid = new UUID((getUnlocalizedName() + slot.toString()).hashCode(), 0); + if (slot == this.armorType) { + multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getAttributeUnlocalizedName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) getArmorDisplay(null, new ItemStack(this), type.getIndex()) / 20, 0)); + } return multimap; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java index 87911b83f..9e5eb0ce6 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java @@ -53,9 +53,10 @@ public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISorta public ItemManasteelAxe(ToolMaterial mat, String name) { super(mat, ImmutableSet.of()); - // todo attack speed and set setCreativeTab(BotaniaCreativeTab.INSTANCE); setUnlocalizedName(name); + this.damageVsEntity = 8f; + this.attackSpeed = -3.1f; } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java index 935954c38..e56249902 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -76,6 +76,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker public ItemTerraAxe() { super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_AXE); MinecraftForge.EVENT_BUS.register(this); + this.attackSpeed = -3f; } public boolean shouldBreak(EntityPlayer player) {