Tentatively change relics to use UUID. Still use playernames for display

This commit is contained in:
Vincent Lee committed 2015-12-24 14:42:52 -06:00
1 parent 70d4450a6a
commit 0687f56c32
7 files changed
+69 -39

No files matched your search

@@ -13,6 +13,8 @@ package vazkii.botania.api.item;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.Achievement;
import java.util.UUID;
/**
* An item that implements this counts as a Relic item. This is purely for interaction
* and other mod items should not implement this interface.
@@ -20,14 +22,14 @@ import net.minecraft.stats.Achievement;
public interface IRelic {
/**
* Binds to the player name passed in.
* Binds to the player UUID passed in.
*/
public void bindToUsername(String playerName, ItemStack stack);
public void bindToUuid(UUID playerName, ItemStack stack);
/**
* Gets the username of the person this relic is bound to.
* Gets the UUID of the person this relic is bound to.
*/
public String getSoulbindUsername(ItemStack stack);
public UUID getSoulbindUuid(ItemStack stack);
/**
* Sets the achievement that this relic binds to.
@@ -18,6 +18,8 @@ import net.minecraftforge.common.ForgeHooks;
import vazkii.botania.api.item.IRelic;
import vazkii.botania.common.item.ModItems;
import java.util.UUID;
public class AesirRingRecipe implements IRecipe {
@Override
@@ -44,13 +46,13 @@ public class AesirRingRecipe implements IRecipe {
@Override
public ItemStack getCraftingResult(InventoryCrafting var1) {
String soulbind = null;
UUID soulbind = null;
for(int i = 0; i < var1.getSizeInventory(); i++) {
ItemStack stack = var1.getStackInSlot(i);
if(stack != null) {
if(stack.getItem() instanceof IRelic) {
String bind = ((IRelic) stack.getItem()).getSoulbindUsername(stack);
UUID bind = ((IRelic) stack.getItem()).getSoulbindUuid(stack);
if(soulbind == null)
soulbind = bind;
else if(!soulbind.equals(bind))
@@ -60,7 +62,7 @@ public class AesirRingRecipe implements IRecipe {
}
ItemStack stack = new ItemStack(ModItems.aesirRing);
((IRelic) ModItems.aesirRing).bindToUsername(soulbind, stack);
((IRelic) ModItems.aesirRing).bindToUuid(soulbind, stack);
return stack;
}
@@ -13,7 +13,10 @@ package vazkii.botania.common.entity;
import java.awt.Rectangle;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.regex.Pattern;
import net.minecraft.block.Block;
@@ -107,7 +110,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
boolean spawnPixies = false;
boolean anyWithArmor = false;
List<String> playersWhoAttacked = new ArrayList();
List<UUID> playersWhoAttacked = new ArrayList<UUID>();
private static boolean isPlayingMusic = false;
@@ -357,8 +360,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
Entity e = par1DamageSource.getEntity();
if((par1DamageSource.damageType.equals("player") || e instanceof EntityPixie) && e != null && isTruePlayer(e) && getInvulTime() == 0) {
EntityPlayer player = (EntityPlayer) e;
if(!playersWhoAttacked.contains(player.getName()))
playersWhoAttacked.add(player.getName());
if(!playersWhoAttacked.contains(player.getUniqueID()))
playersWhoAttacked.add(player.getUniqueID());
float dmg = par2;
boolean crit = false;
@@ -445,7 +448,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
entityDropItem(new ItemStack(ModItems.ancientWill, 1, rand.nextInt(6)), 1F);
if(ConfigHandler.relicsEnabled) {
ItemStack dice = new ItemStack(ModItems.dice);
ItemRelic.bindToUsernameS(playersWhoAttacked.get(pl), dice);
ItemRelic.bindToUuidS(playersWhoAttacked.get(pl), dice);
entityDropItem(dice, 1F);
}
@@ -11,6 +11,7 @@
package vazkii.botania.common.item.relic;
import java.util.List;
import java.util.UUID;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.SharedMonsterAttributes;
@@ -61,10 +62,10 @@ public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframe
if(stack.getItem() != null && stack.getItem() == this) {
event.entityItem.setDead();
String user = getSoulbindUsername(stack);
UUID user = getSoulbindUuid(stack);
for(Item item : new Item[] { ModItems.thorRing, ModItems.lokiRing, ModItems.odinRing }) {
ItemStack stack1 = new ItemStack(item);
bindToUsername(user, stack1);
bindToUuid(user, stack1);
EntityItem entity = new EntityItem(event.entityItem.worldObj, event.entityItem.posX, event.entityItem.posY, event.entityItem.posZ, stack1);
entity.motionX = event.entityItem.motionX;
entity.motionY = event.entityItem.motionY;
@@ -11,7 +11,9 @@
package vazkii.botania.common.item.relic;
import java.util.List;
import java.util.UUID;
import com.mojang.authlib.GameProfile;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -30,7 +32,8 @@ import vazkii.botania.common.item.ModItems;
public class ItemRelic extends ItemMod implements IRelic {
private static final String TAG_SOULBIND = "soulbind";
private static final String TAG_SOLBIND_NAME = "soulbind";
private static final String TAG_SOULBIND_UUID = "soulbindUuid";
Achievement achievement;
@@ -50,15 +53,19 @@ public class ItemRelic extends ItemMod implements IRelic {
addBindInfo(p_77624_3_, p_77624_1_, p_77624_2_);
}
public static void addBindInfo(List list, ItemStack stack, EntityPlayer player) {
public static void addBindInfo(List<String> list, ItemStack stack, EntityPlayer player) {
if(GuiScreen.isShiftKeyDown()) {
String bind = getSoulbindUsernameS(stack);
if(bind.isEmpty())
UUID bind = getSoulbindUuidS(stack);
if(bind == null)
addStringToTooltip(StatCollector.translateToLocal("botaniamisc.relicUnbound"), list);
else {
addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.relicSoulbound"), bind), list);
String disp = getSoulbindNameS(stack);
if (disp.isEmpty()) {
disp = bind.toString();
}
addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.relicSoulbound"), disp), list);
if(!isRightPlayer(player, stack))
addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.notYourSagittarius"), bind), list);
addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.notYourSagittarius"), disp), list);
}
if(stack.getItem() == ModItems.aesirRing)
@@ -86,19 +93,28 @@ public class ItemRelic extends ItemMod implements IRelic {
tooltip.add(s.replaceAll("&", "\u00a7"));
}
public static String getSoulbindUsernameS(ItemStack stack) {
return ItemNBTHelper.getString(stack, TAG_SOULBIND, "");
public static UUID getSoulbindUuidS(ItemStack stack) {
try {
return UUID.fromString(ItemNBTHelper.getString(stack, TAG_SOULBIND_UUID, ""));
} catch (IllegalArgumentException ex) {
// Bad text in tag
return null;
}
}
public static String getSoulbindNameS(ItemStack stack) {
return ItemNBTHelper.getString(stack, TAG_SOLBIND_NAME, "");
}
public static void updateRelic(ItemStack stack, EntityPlayer player) {
if(stack == null || !(stack.getItem() instanceof IRelic))
return;
String soulbind = getSoulbindUsernameS(stack);
if(soulbind.isEmpty()) {
UUID soulbind = getSoulbindUuidS(stack);
if(soulbind == null) {
player.addStat(((IRelic) stack.getItem()).getBindAchievement(), 1);
bindToPlayer(player, stack);
soulbind = getSoulbindUsernameS(stack);
soulbind = getSoulbindUuidS(stack);
}
if(!isRightPlayer(player, stack) && player.ticksExisted % 10 == 0 && (!(stack.getItem() instanceof ItemRelic) || ((ItemRelic) stack.getItem()).shouldDamageWrongPlayer()))
@@ -106,19 +122,24 @@ public class ItemRelic extends ItemMod implements IRelic {
}
public static void bindToPlayer(EntityPlayer player, ItemStack stack) {
bindToUsernameS(player.getName(), stack);
bindToUuidS(player.getUniqueID(), stack);
bindToNameS(player.getName(), stack);
}
public static void bindToUsernameS(String username, ItemStack stack) {
ItemNBTHelper.setString(stack, TAG_SOULBIND, username);
public static void bindToNameS(String playerName, ItemStack stack) {
ItemNBTHelper.setString(stack, TAG_SOLBIND_NAME, playerName);
}
public static void bindToUuidS(UUID uuid, ItemStack stack) {
ItemNBTHelper.setString(stack, TAG_SOULBIND_UUID, uuid.toString());
}
public static boolean isRightPlayer(EntityPlayer player, ItemStack stack) {
return isRightPlayer(player.getName(), stack);
return isRightPlayer(player.getUniqueID(), stack);
}
public static boolean isRightPlayer(String player, ItemStack stack) {
return getSoulbindUsernameS(stack).equals(player);
public static boolean isRightPlayer(UUID uuid, ItemStack stack) {
return uuid.equals(getSoulbindUuidS(stack));
}
public static DamageSource damageSource() {
@@ -126,13 +147,13 @@ public class ItemRelic extends ItemMod implements IRelic {
}
@Override
public void bindToUsername(String playerName, ItemStack stack) {
bindToUsernameS(playerName, stack);
public void bindToUuid(UUID playerName, ItemStack stack) {
bindToUuidS(playerName, stack);
}
@Override
public String getSoulbindUsername(ItemStack stack) {
return getSoulbindUsernameS(stack);
public UUID getSoulbindUuid(ItemStack stack) {
return getSoulbindUuidS(stack);
}
@Override
@@ -11,6 +11,7 @@
package vazkii.botania.common.item.relic;
import java.util.List;
import java.util.UUID;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@@ -64,13 +65,13 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic {
}
@Override
public void bindToUsername(String playerName, ItemStack stack) {
ItemRelic.bindToUsernameS(playerName, stack);
public void bindToUuid(UUID playerName, ItemStack stack) {
ItemRelic.bindToUuidS(playerName, stack);
}
@Override
public String getSoulbindUsername(ItemStack stack) {
return ItemRelic.getSoulbindUsernameS(stack);
public UUID getSoulbindUuid(ItemStack stack) {
return ItemRelic.getSoulbindUuidS(stack);
}
@Override