mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 19:05:16 +00:00
Merge upstream pull request #1693 from Katrix-/relicsUUID
This commit is contained in:
commit
d1ff5e89ca
5 files changed
+132
-11
No files matched your search
@@ -10,6 +10,8 @@
|
||||
*/
|
||||
package vazkii.botania.api.item;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.stats.Achievement;
|
||||
|
||||
@@ -22,6 +24,7 @@ public interface IRelic {
|
||||
/**
|
||||
* Binds to the player name passed in.
|
||||
*/
|
||||
@Deprecated
|
||||
public void bindToUsername(String playerName, ItemStack stack);
|
||||
|
||||
/**
|
||||
@@ -29,6 +32,21 @@ public interface IRelic {
|
||||
*/
|
||||
public String getSoulbindUsername(ItemStack stack);
|
||||
|
||||
/**
|
||||
* Binds to the UUID passed in.
|
||||
*/
|
||||
public void bindToUUID(UUID uuid, ItemStack stack);
|
||||
|
||||
/**
|
||||
* Gets the UUID of the person this relic is bound to.
|
||||
*/
|
||||
public UUID getSoulbindUUID(ItemStack stack);
|
||||
|
||||
/**
|
||||
* Checks if the relic is using UUIDs.
|
||||
*/
|
||||
public boolean hasUUID(ItemStack stack);
|
||||
|
||||
/**
|
||||
* Sets the achievement that this relic binds to.
|
||||
*/
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
*/
|
||||
package vazkii.botania.common.crafting.recipe;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
@@ -45,22 +47,37 @@ public class AesirRingRecipe implements IRecipe {
|
||||
@Override
|
||||
public ItemStack getCraftingResult(InventoryCrafting var1) {
|
||||
String soulbind = null;
|
||||
UUID soulbindUUID = null;
|
||||
boolean hasUUID = false;
|
||||
|
||||
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);
|
||||
if(soulbind == null)
|
||||
soulbind = bind;
|
||||
else if(!soulbind.equals(bind))
|
||||
return null;
|
||||
if(((IRelic) stack.getItem()).hasUUID(stack)) {
|
||||
hasUUID = true;
|
||||
UUID bindUUID = ((IRelic) stack.getItem()).getSoulbindUUID(stack);
|
||||
if(soulbindUUID == null)
|
||||
soulbindUUID = bindUUID;
|
||||
else if(!soulbindUUID.equals(bindUUID))
|
||||
return null;
|
||||
}
|
||||
else {
|
||||
String bind = ((IRelic) stack.getItem()).getSoulbindUsername(stack);
|
||||
if(soulbind == null)
|
||||
soulbind = bind;
|
||||
else if(!soulbind.equals(bind))
|
||||
return null;
|
||||
}
|
||||
} else return null;
|
||||
}
|
||||
}
|
||||
|
||||
ItemStack stack = new ItemStack(ModItems.aesirRing);
|
||||
((IRelic) ModItems.aesirRing).bindToUsername(soulbind, stack);
|
||||
if(hasUUID)
|
||||
((IRelic) ModItems.aesirRing).bindToUUID(soulbindUUID, stack);
|
||||
else
|
||||
((IRelic) ModItems.aesirRing).bindToUsername(soulbind, stack);
|
||||
return stack;
|
||||
}
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@ import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
@@ -108,7 +109,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
|
||||
boolean spawnPixies = false;
|
||||
boolean anyWithArmor = false;
|
||||
|
||||
List<String> playersWhoAttacked = new ArrayList<>();
|
||||
List<UUID> playersWhoAttacked = new ArrayList<>();
|
||||
|
||||
private static boolean isPlayingMusic = false;
|
||||
|
||||
@@ -358,8 +359,9 @@ 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;
|
||||
@@ -446,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,17 +11,21 @@
|
||||
package vazkii.botania.common.item.relic;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.stats.Achievement;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.UsernameCache;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.item.IRelic;
|
||||
import vazkii.botania.common.core.helper.ItemNBTHelper;
|
||||
@@ -30,7 +34,9 @@ import vazkii.botania.common.item.ModItems;
|
||||
|
||||
public class ItemRelic extends ItemMod implements IRelic {
|
||||
|
||||
@Deprecated
|
||||
private static final String TAG_SOULBIND = "soulbind";
|
||||
private static final String TAG_SOULBIND_UUID = "soulbindUUID";
|
||||
|
||||
Achievement achievement;
|
||||
|
||||
@@ -87,13 +93,25 @@ public class ItemRelic extends ItemMod implements IRelic {
|
||||
}
|
||||
|
||||
public static String getSoulbindUsernameS(ItemStack stack) {
|
||||
if(hasUUIDS(stack))
|
||||
return UsernameCache.getLastKnownUsername(getSoulbindUUIDS(stack));
|
||||
return ItemNBTHelper.getString(stack, TAG_SOULBIND, "");
|
||||
}
|
||||
|
||||
//TODO: Better name?
|
||||
public static UUID getSoulbindUUIDS(ItemStack stack) {
|
||||
if(hasUUIDS(stack))
|
||||
return UUID.fromString(ItemNBTHelper.getString(stack, TAG_SOULBIND_UUID, ""));
|
||||
return null;
|
||||
}
|
||||
|
||||
public static void updateRelic(ItemStack stack, EntityPlayer player) {
|
||||
if(stack == null || !(stack.getItem() instanceof IRelic))
|
||||
return;
|
||||
|
||||
if(!hasUUIDS(stack) && isRightPlayer(player.getName(), stack))
|
||||
bindToPlayer(player, stack);
|
||||
|
||||
String soulbind = getSoulbindUsernameS(stack);
|
||||
if(soulbind.isEmpty()) {
|
||||
player.addStat(((IRelic) stack.getItem()).getBindAchievement(), 1);
|
||||
@@ -106,14 +124,22 @@ public class ItemRelic extends ItemMod implements IRelic {
|
||||
}
|
||||
|
||||
public static void bindToPlayer(EntityPlayer player, ItemStack stack) {
|
||||
bindToUsernameS(player.getName(), stack);
|
||||
bindToUUIDS(player.getUniqueID(), stack);
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
public static void bindToUsernameS(String username, ItemStack stack) {
|
||||
ItemNBTHelper.setString(stack, TAG_SOULBIND, username);
|
||||
}
|
||||
|
||||
//TODO: Better name?
|
||||
public static void bindToUUIDS(UUID uuid, ItemStack stack) {
|
||||
ItemNBTHelper.setString(stack, TAG_SOULBIND_UUID, uuid.toString());
|
||||
}
|
||||
|
||||
public static boolean isRightPlayer(EntityPlayer player, ItemStack stack) {
|
||||
if(hasUUIDS(stack))
|
||||
return isRightPlayer(player.getUniqueID(), stack);
|
||||
return isRightPlayer(player.getName(), stack);
|
||||
}
|
||||
|
||||
@@ -121,11 +147,38 @@ public class ItemRelic extends ItemMod implements IRelic {
|
||||
return getSoulbindUsernameS(stack).equals(player);
|
||||
}
|
||||
|
||||
public static boolean isRightPlayer(UUID uuid, ItemStack stack) {
|
||||
return getSoulbindUUIDS(stack) != null && getSoulbindUUIDS(stack).equals(uuid);
|
||||
}
|
||||
|
||||
public static DamageSource damageSource() {
|
||||
return new DamageSource("botania-relic");
|
||||
}
|
||||
|
||||
//TODO: Better name?
|
||||
public static boolean hasUUIDS(ItemStack stack) {
|
||||
return ItemNBTHelper.verifyExistance(stack, TAG_SOULBIND_UUID);
|
||||
}
|
||||
|
||||
public static UUID usernameToUUID(String username) {
|
||||
return getPlayerByName(username) == null ? null : getPlayerByName(username).getUniqueID();
|
||||
}
|
||||
|
||||
public static EntityPlayer getPlayerByName(String username) {
|
||||
if(username.isEmpty())
|
||||
return null;
|
||||
|
||||
List<EntityPlayerMP> playerList = MinecraftServer.getServer().getConfigurationManager().playerEntityList;
|
||||
for (EntityPlayerMP player : playerList) {
|
||||
if (player.getName().equals(username))
|
||||
return player;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Deprecated
|
||||
public void bindToUsername(String playerName, ItemStack stack) {
|
||||
bindToUsernameS(playerName, stack);
|
||||
}
|
||||
@@ -135,6 +188,21 @@ public class ItemRelic extends ItemMod implements IRelic {
|
||||
return getSoulbindUsernameS(stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void bindToUUID(UUID uuid, ItemStack stack) {
|
||||
bindToUUIDS(uuid, stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public UUID getSoulbindUUID(ItemStack stack) {
|
||||
return getSoulbindUUIDS(stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasUUID(ItemStack stack) {
|
||||
return hasUUIDS(stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Achievement getBindAchievement() {
|
||||
return achievement;
|
||||
|
||||
@@ -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;
|
||||
@@ -73,6 +74,21 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic {
|
||||
return ItemRelic.getSoulbindUsernameS(stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void bindToUUID(UUID uuid, ItemStack stack) {
|
||||
ItemRelic.bindToUUIDS(uuid, stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public UUID getSoulbindUUID(ItemStack stack) {
|
||||
return ItemRelic.getSoulbindUUIDS(stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasUUID(ItemStack stack) {
|
||||
return ItemRelic.hasUUIDS(stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Achievement getBindAchievement() {
|
||||
return achievement;
|
||||
|
||||
Reference in new issue
Block a user