Totally refactor frequencies to use UUIDs instead of player usernames

This commit is contained in:
aidancbrady committed 2017-04-24 14:15:43 -04:00
1 parent b72740cffd
commit 6f2b84e547
31 files changed
+328 -221

No files matched your search

@@ -3,6 +3,7 @@ package mekanism.common.tile.component;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.UUID;
import mekanism.api.Coord4D;
import mekanism.common.Mekanism;
@@ -16,13 +17,15 @@ import mekanism.common.security.SecurityFrequency;
import mekanism.common.tile.TileEntityContainerBlock;
import mekanism.common.util.MekanismUtils;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.UsernameCache;
public class TileComponentSecurity implements ITileComponent
{
/** TileEntity implementing this component. */
public TileEntityContainerBlock tileEntity;
private String owner;
private UUID ownerUUID;
private String clientOwner;
private SecurityMode securityMode = SecurityMode.PUBLIC;
@@ -37,7 +40,7 @@ public class TileComponentSecurity implements ITileComponent
public void readFrom(TileComponentSecurity security)
{
owner = security.owner;
ownerUUID = security.ownerUUID;
securityMode = security.securityMode;
}
@@ -46,22 +49,29 @@ public class TileComponentSecurity implements ITileComponent
return frequency;
}
public String getOwner()
public UUID getOwnerUUID()
{
return owner;
return ownerUUID;
}
public void setOwner(String o)
public String getClientOwner()
{
return clientOwner;
}
public void setOwnerUUID(UUID uuid)
{
frequency = null;
owner = o;
ownerUUID = uuid;
}
public SecurityMode getMode()
{
if(general.allowProtection) {
if(general.allowProtection)
{
return securityMode;
} else {
}
else {
return SecurityMode.PUBLIC;
}
}
@@ -73,7 +83,7 @@ public class TileComponentSecurity implements ITileComponent
public FrequencyManager getManager(Frequency freq)
{
if(owner == null || freq == null)
if(ownerUUID == null || freq == null)
{
return null;
}
@@ -81,14 +91,14 @@ public class TileComponentSecurity implements ITileComponent
return Mekanism.securityFrequencies;
}
public void setFrequency(String owner)
public void setFrequency(UUID owner)
{
FrequencyManager manager = Mekanism.securityFrequencies;
manager.deactivate(Coord4D.get(tileEntity));
for(Frequency freq : manager.getFrequencies())
{
if(freq.owner.equals(owner))
if(freq.ownerUUID.equals(owner))
{
frequency = (SecurityFrequency)freq;
frequency.activeCoords.add(Coord4D.get(tileEntity));
@@ -111,9 +121,9 @@ public class TileComponentSecurity implements ITileComponent
{
if(!tileEntity.getWorld().isRemote)
{
if(frequency == null && owner != null)
if(frequency == null && ownerUUID != null)
{
setFrequency(owner);
setFrequency(ownerUUID);
}
FrequencyManager manager = getManager(frequency);
@@ -122,12 +132,12 @@ public class TileComponentSecurity implements ITileComponent
{
if(frequency != null && !frequency.valid)
{
frequency = (SecurityFrequency)manager.validateFrequency(owner, Coord4D.get(tileEntity), frequency);
frequency = (SecurityFrequency)manager.validateFrequency(ownerUUID, Coord4D.get(tileEntity), frequency);
}
if(frequency != null)
{
frequency = (SecurityFrequency)manager.update(owner, Coord4D.get(tileEntity), frequency);
frequency = (SecurityFrequency)manager.update(Coord4D.get(tileEntity), frequency);
}
}
else {
@@ -143,7 +153,7 @@ public class TileComponentSecurity implements ITileComponent
if(nbtTags.hasKey("owner"))
{
owner = nbtTags.getString("owner");
ownerUUID = UUID.fromString(nbtTags.getString("ownerUUID"));
}
if(nbtTags.hasKey("securityFreq"))
@@ -160,10 +170,12 @@ public class TileComponentSecurity implements ITileComponent
if(dataStream.readBoolean())
{
owner = PacketHandler.readString(dataStream);
ownerUUID = UUID.fromString(PacketHandler.readString(dataStream));
clientOwner = PacketHandler.readString(dataStream);
}
else {
owner = null;
ownerUUID = null;
clientOwner = null;
}
if(dataStream.readBoolean())
@@ -180,9 +192,9 @@ public class TileComponentSecurity implements ITileComponent
{
nbtTags.setInteger("securityMode", securityMode.ordinal());
if(owner != null)
if(ownerUUID != null)
{
nbtTags.setString("owner", owner);
nbtTags.setString("ownerUUID", ownerUUID.toString());
}
if(frequency != null)
@@ -198,10 +210,11 @@ public class TileComponentSecurity implements ITileComponent
{
data.add(securityMode.ordinal());
if(owner != null)
if(ownerUUID != null)
{
data.add(true);
data.add(owner);
data.add(ownerUUID.toString());
data.add(UsernameCache.getLastKnownUsername(ownerUUID));
}
else {
data.add(false);