From 893cf4dc07e7c581b28eb40d4fdbf79865a5b715 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 10 Apr 2015 12:17:01 +0100 Subject: [PATCH] Baubles now generate a random UUID and use it to create attributes for the attribute map. Fixes the Ring of Odin visually killing the player when removed. Closes #720 --- .../item/equipment/bauble/ItemBauble.java | 20 +++++++++++++++++-- .../equipment/bauble/ItemBaubleModifier.java | 7 +++++-- .../equipment/bauble/ItemKnockbackBelt.java | 4 ++-- .../common/item/relic/ItemAesirRing.java | 10 +++++++--- .../common/item/relic/ItemOdinRing.java | 10 +++++++--- 5 files changed, 39 insertions(+), 12 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index f7068cd00..1dc26dad4 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.List; +import java.util.UUID; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.EntityLivingBase; @@ -34,6 +35,8 @@ import cpw.mods.fml.relauncher.SideOnly; public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAttachable { private static final String TAG_HASHCODE = "playerHashcode"; + private static final String TAG_BAUBLE_UUID_MOST = "baubleUUIDMost"; + private static final String TAG_BAUBLE_UUID_LEAST = "baubleUUIDLeast"; private static final String TAG_COSMETIC_ITEM = "cosmeticItem"; public ItemBauble(String name) { @@ -169,12 +172,25 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt public boolean doesContainerItemLeaveCraftingGrid(ItemStack p_77630_1_) { return false; } + + public static UUID getBaubleUUID(ItemStack stack) { + long most = ItemNBTHelper.getLong(stack, TAG_BAUBLE_UUID_MOST, 0); + if(most == 0) { + UUID uuid = UUID.randomUUID(); + ItemNBTHelper.setLong(stack, TAG_BAUBLE_UUID_MOST, uuid.getMostSignificantBits()); + ItemNBTHelper.setLong(stack, TAG_BAUBLE_UUID_LEAST, uuid.getLeastSignificantBits()); + return getBaubleUUID(stack); + } + + long least = ItemNBTHelper.getLong(stack, TAG_BAUBLE_UUID_LEAST, 0); + return new UUID(most, least); + } - public int getLastPlayerHashcode(ItemStack stack) { + public static int getLastPlayerHashcode(ItemStack stack) { return ItemNBTHelper.getInt(stack, TAG_HASHCODE, 0); } - public void setLastPlayerHashcode(ItemStack stack, int hash) { + public static void setLastPlayerHashcode(ItemStack stack, int hash) { ItemNBTHelper.setInt(stack, TAG_HASHCODE, hash); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java index 07ba6636d..d920e453e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java @@ -23,19 +23,22 @@ public abstract class ItemBaubleModifier extends ItemBauble { public ItemBaubleModifier(String name) { super(name); - fillModifiers(attributes); } @Override public void onEquippedOrLoadedIntoWorld(ItemStack stack, EntityLivingBase player) { + attributes.clear(); + fillModifiers(attributes, stack); player.getAttributeMap().applyAttributeModifiers(attributes); } @Override public void onUnequipped(ItemStack stack, EntityLivingBase player) { + attributes.clear(); + fillModifiers(attributes, stack); player.getAttributeMap().removeAttributeModifiers(attributes); } - abstract void fillModifiers(Multimap attributes); + abstract void fillModifiers(Multimap attributes, ItemStack stack); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index 21c413d24..b75d1ca15 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -47,8 +47,8 @@ public class ItemKnockbackBelt extends ItemBaubleModifier implements IBaubleRend } @Override - void fillModifiers(Multimap attributes) { - attributes.put(SharedMonsterAttributes.knockbackResistance.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(2745708 /** Random number **/, 43743), "Bauble modifier", 1, 0)); + void fillModifiers(Multimap attributes, ItemStack stack) { + attributes.put(SharedMonsterAttributes.knockbackResistance.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 1, 0)); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 91d4a03cf..6ddcf699e 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -42,7 +42,6 @@ public class ItemAesirRing extends ItemRelicBauble implements IWireframeCoordina public ItemAesirRing() { super(LibItemNames.AESIR_RING); - fillModifiers(attributes); GameRegistry.addRecipe(new AesirRingRecipe()); RecipeSorter.register("botania:aesirRing", AesirRingRecipe.class, Category.SHAPELESS, ""); } @@ -64,16 +63,21 @@ public class ItemAesirRing extends ItemRelicBauble implements IWireframeCoordina @Override public void onEquippedOrLoadedIntoWorld(ItemStack stack, EntityLivingBase player) { + attributes.clear(); + fillModifiers(attributes, stack); player.getAttributeMap().applyAttributeModifiers(attributes); } @Override public void onUnequipped(ItemStack stack, EntityLivingBase player) { + attributes.clear(); + fillModifiers(attributes, stack); player.getAttributeMap().removeAttributeModifiers(attributes); } - void fillModifiers(Multimap attributes) { - attributes.put(SharedMonsterAttributes.maxHealth.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(2756708 /** Random number **/, 43873), "Bauble modifier", 20, 0)); + + void fillModifiers(Multimap attributes, ItemStack stack) { + attributes.put(SharedMonsterAttributes.maxHealth.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 20, 0)); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index 4a19fc3a6..9a25bc092 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -51,7 +51,6 @@ public class ItemOdinRing extends ItemRelicBauble { public ItemOdinRing() { super(LibItemNames.ODIN_RING); - fillModifiers(attributes); MinecraftForge.EVENT_BUS.register(this); } @@ -90,16 +89,21 @@ public class ItemOdinRing extends ItemRelicBauble { @Override public void onEquippedOrLoadedIntoWorld(ItemStack stack, EntityLivingBase player) { + attributes.clear(); + fillModifiers(attributes, stack); player.getAttributeMap().applyAttributeModifiers(attributes); } @Override public void onUnequipped(ItemStack stack, EntityLivingBase player) { + attributes.clear(); + fillModifiers(attributes, stack); player.getAttributeMap().removeAttributeModifiers(attributes); } - void fillModifiers(Multimap attributes) { - attributes.put(SharedMonsterAttributes.maxHealth.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(2755708 /** Random number **/, 43843), "Bauble modifier", 20, 0)); + + void fillModifiers(Multimap attributes, ItemStack stack) { + attributes.put(SharedMonsterAttributes.maxHealth.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 20, 0)); } }