diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index d7d1686b6..0288290f9 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -6,6 +6,7 @@ import ic2.api.item.IElectricItem; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.List; +import java.util.UUID; import mekanism.api.Coord4D; import mekanism.api.energy.EnergizedItemManager; @@ -52,6 +53,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.UsernameCache; import net.minecraftforge.common.util.Constants; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; @@ -75,7 +77,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine public boolean texTick; private static final DataParameter ELECTRICITY = EntityDataManager.createKey(EntityRobit.class, DataSerializers.FLOAT); - private static final DataParameter OWNER = EntityDataManager.createKey(EntityRobit.class, DataSerializers.STRING); + private static final DataParameter OWNER_UUID = EntityDataManager.createKey(EntityRobit.class, DataSerializers.STRING); private static final DataParameter FOLLOW = EntityDataManager.createKey(EntityRobit.class, DataSerializers.BOOLEAN); private static final DataParameter DROP_PICKUP = EntityDataManager.createKey(EntityRobit.class, DataSerializers.BOOLEAN); @@ -134,7 +136,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine super.entityInit(); dataManager.register(ELECTRICITY, 0F); - dataManager.register(OWNER, ""); + dataManager.register(OWNER_UUID, ""); dataManager.register(FOLLOW, false); dataManager.register(DROP_PICKUP, false); } @@ -443,9 +445,9 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine nbtTags.setString("name", getName()); - if(getOwnerName() != null) + if(getOwnerUUID() != null) { - nbtTags.setString("owner", getOwnerName()); + nbtTags.setString("ownerUUID", getOwnerUUID().toString()); } nbtTags.setBoolean("follow", getFollowing()); @@ -482,9 +484,9 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine setCustomNameTag(nbtTags.getString("name")); - if(nbtTags.hasKey("owner")) + if(nbtTags.hasKey("ownerUUID")) { - setOwner(nbtTags.getString("owner")); + setOwnerUUID(UUID.fromString(nbtTags.getString("ownerUUID"))); } setFollowing(nbtTags.getBoolean("follow")); @@ -552,17 +554,22 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine public EntityPlayer getOwner() { - return world.getPlayerEntityByName(getOwnerName()); + return world.getPlayerEntityByUUID(getOwnerUUID()); } public String getOwnerName() { - return dataManager.get(OWNER); + return UsernameCache.getLastKnownUsername(getOwnerUUID()); } - public void setOwner(String username) + public UUID getOwnerUUID() { - dataManager.set(OWNER, username); + return UUID.fromString(dataManager.get(OWNER_UUID)); + } + + public void setOwnerUUID(UUID uuid) + { + dataManager.set(OWNER_UUID, uuid.toString()); } public boolean getFollowing() diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index 28131aa15..cab8fae5c 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -334,9 +334,9 @@ public class FrequencyManager try { String frequencyClass = nbtTags.getString("frequencyClass"); - if(nbtTags.hasKey("owner")) + if(nbtTags.hasKey("ownerUUID")) { - loadedOwner = UUID.fromString(nbtTags.getString("owner")); + loadedOwner = UUID.fromString(nbtTags.getString("ownerUUID")); } NBTTagList list = nbtTags.getTagList("freqList", NBT.TAG_COMPOUND); @@ -364,7 +364,7 @@ public class FrequencyManager if(manager.ownerUUID != null) { - nbtTags.setString("owner", manager.ownerUUID.toString()); + nbtTags.setString("ownerUUID", manager.ownerUUID.toString()); } NBTTagList list = new NBTTagList(); diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 02d931125..2fe310258 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -333,9 +333,9 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS @Override public UUID getOwnerUUID(ItemStack stack) { - if(ItemDataUtils.hasData(stack, "owner")) + if(ItemDataUtils.hasData(stack, "ownerUUID")) { - return UUID.fromString(ItemDataUtils.getString(stack, "owner")); + return UUID.fromString(ItemDataUtils.getString(stack, "ownerUUID")); } return null; @@ -346,11 +346,11 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS { if(owner == null) { - ItemDataUtils.removeData(stack, "owner"); + ItemDataUtils.removeData(stack, "ownerUUID"); return; } - ItemDataUtils.setString(stack, "owner", owner.toString()); + ItemDataUtils.setString(stack, "ownerUUID", owner.toString()); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 7a28fd900..0464af627 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -351,9 +351,9 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI @Override public UUID getOwnerUUID(ItemStack stack) { - if(ItemDataUtils.hasData(stack, "owner")) + if(ItemDataUtils.hasData(stack, "ownerUUID")) { - return UUID.fromString(ItemDataUtils.getString(stack, "owner")); + return UUID.fromString(ItemDataUtils.getString(stack, "ownerUUID")); } return null; @@ -364,11 +364,11 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI { if(owner == null) { - ItemDataUtils.removeData(stack, "owner"); + ItemDataUtils.removeData(stack, "ownerUUID"); return; } - ItemDataUtils.setString(stack, "owner", owner.toString()); + ItemDataUtils.setString(stack, "ownerUUID", owner.toString()); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 1c7f82062..5bb398a5d 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -871,9 +871,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override public UUID getOwnerUUID(ItemStack stack) { - if(ItemDataUtils.hasData(stack, "owner")) + if(ItemDataUtils.hasData(stack, "ownerUUID")) { - return UUID.fromString(ItemDataUtils.getString(stack, "owner")); + return UUID.fromString(ItemDataUtils.getString(stack, "ownerUUID")); } return null; @@ -884,11 +884,11 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { if(owner == null) { - ItemDataUtils.removeData(stack, "owner"); + ItemDataUtils.removeData(stack, "ownerUUID"); return; } - ItemDataUtils.setString(stack, "owner", owner.toString()); + ItemDataUtils.setString(stack, "ownerUUID", owner.toString()); } @Override diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index 1e282c9a5..bbe06930b 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -100,9 +100,9 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem @Override public UUID getOwnerUUID(ItemStack stack) { - if(ItemDataUtils.hasData(stack, "owner")) + if(ItemDataUtils.hasData(stack, "ownerUUID")) { - return UUID.fromString(ItemDataUtils.getString(stack, "owner")); + return UUID.fromString(ItemDataUtils.getString(stack, "ownerUUID")); } return null; @@ -116,11 +116,11 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem if(owner == null) { - ItemDataUtils.removeData(stack, "owner"); + ItemDataUtils.removeData(stack, "ownerUUID"); return; } - ItemDataUtils.setString(stack, "owner", owner.toString()); + ItemDataUtils.setString(stack, "ownerUUID", owner.toString()); } @Override diff --git a/src/main/java/mekanism/common/item/ItemRobit.java b/src/main/java/mekanism/common/item/ItemRobit.java index 7cbef18df..899bf3e48 100644 --- a/src/main/java/mekanism/common/item/ItemRobit.java +++ b/src/main/java/mekanism/common/item/ItemRobit.java @@ -56,7 +56,7 @@ public class ItemRobit extends ItemEnergized implements ISustainedInventory robit.setHome(Coord4D.get(chargepad)); robit.setEnergy(getEnergy(itemstack)); - robit.setOwner(entityplayer.getName()); + robit.setOwnerUUID(entityplayer.getUniqueID()); robit.setInventory(getInventory(itemstack)); robit.setCustomNameTag(getName(itemstack)); diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index ddc79e6a0..d30f49395 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -420,9 +420,9 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp @Override public UUID getOwnerUUID(ItemStack stack) { - if(ItemDataUtils.hasData(stack, "owner")) + if(ItemDataUtils.hasData(stack, "ownerUUID")) { - return UUID.fromString(ItemDataUtils.getString(stack, "owner")); + return UUID.fromString(ItemDataUtils.getString(stack, "ownerUUID")); } return null; @@ -433,11 +433,11 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp { if(owner == null) { - ItemDataUtils.removeData(stack, "owner"); + ItemDataUtils.removeData(stack, "ownerUUID"); return; } - ItemDataUtils.setString(stack, "owner", owner.toString()); + ItemDataUtils.setString(stack, "ownerUUID", owner.toString()); } @Override