From a5e816dddcdc0e30b182960a71aacee0bd08b923 Mon Sep 17 00:00:00 2001 From: Xander Date: Fri, 21 Jul 2017 20:35:41 +0800 Subject: [PATCH] Add util method to get Username from UUID, without nulls --- .../mekanism/common/entity/EntityRobit.java | 2 +- .../mekanism/common/frequency/Frequency.java | 3 ++- .../common/network/PacketSecurityUpdate.java | 5 +++-- .../common/tile/TileEntitySecurityDesk.java | 2 +- .../tile/component/TileComponentSecurity.java | 2 +- .../mekanism/common/util/MekanismUtils.java | 19 +++++++++++++++++++ 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 97cd97567..110c845a9 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -578,7 +578,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine public void setOwnerUUID(UUID uuid) { dataManager.set(OWNER_UUID, uuid.toString()); - dataManager.set(OWNER_NAME, UsernameCache.getLastKnownUsername(uuid)); + dataManager.set(OWNER_NAME, MekanismUtils.getLastKnownUsername(uuid)); } public boolean getFollowing() diff --git a/src/main/java/mekanism/common/frequency/Frequency.java b/src/main/java/mekanism/common/frequency/Frequency.java index b4d76e39e..059b80db7 100644 --- a/src/main/java/mekanism/common/frequency/Frequency.java +++ b/src/main/java/mekanism/common/frequency/Frequency.java @@ -9,6 +9,7 @@ import java.util.UUID; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; +import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.UsernameCache; @@ -118,7 +119,7 @@ public class Frequency { data.add(name); data.add(ownerUUID.toString()); - data.add(UsernameCache.getLastKnownUsername(ownerUUID)); + data.add(MekanismUtils.getLastKnownUsername(ownerUUID)); data.add(publicFreq); } diff --git a/src/main/java/mekanism/common/network/PacketSecurityUpdate.java b/src/main/java/mekanism/common/network/PacketSecurityUpdate.java index 4146b91b4..4c4c26e21 100644 --- a/src/main/java/mekanism/common/network/PacketSecurityUpdate.java +++ b/src/main/java/mekanism/common/network/PacketSecurityUpdate.java @@ -13,6 +13,7 @@ import mekanism.common.frequency.Frequency; import mekanism.common.network.PacketSecurityUpdate.SecurityUpdateMessage; import mekanism.common.security.SecurityData; import mekanism.common.security.SecurityFrequency; +import mekanism.common.util.MekanismUtils; import net.minecraftforge.common.UsernameCache; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; @@ -51,7 +52,7 @@ public class PacketSecurityUpdate implements IMessageHandler"; + } + public static enum ResourceType { GUI("gui"),