From 6f2b84e54707c5a37409feed99c9aacc43d6d7bb Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 24 Apr 2017 14:15:43 -0400 Subject: [PATCH] Totally refactor frequencies to use UUIDs instead of player usernames --- .../java/mekanism/client/MekanismClient.java | 3 + .../client/gui/GuiQuantumEntangloporter.java | 8 +-- .../mekanism/client/gui/GuiSecurityDesk.java | 8 +-- .../mekanism/client/gui/GuiTeleporter.java | 25 ++++++-- .../client/gui/element/GuiSecurityTab.java | 27 +++++++-- .../java/mekanism/common/CommandMekanism.java | 4 +- src/main/java/mekanism/common/Mekanism.java | 4 +- .../mekanism/common/block/BlockBasic.java | 7 ++- .../common/block/BlockEnergyCube.java | 2 +- .../mekanism/common/block/BlockGasTank.java | 2 +- .../mekanism/common/block/BlockMachine.java | 7 ++- .../entangloporter/InventoryFrequency.java | 5 +- .../mekanism/common/frequency/Frequency.java | 23 +++++--- .../common/frequency/FrequencyManager.java | 31 +++++----- .../common/item/ItemBlockEnergyCube.java | 20 ++++--- .../common/item/ItemBlockGasTank.java | 20 ++++--- .../common/item/ItemBlockMachine.java | 24 ++++---- .../common/item/ItemPortableTeleporter.java | 21 ++++--- .../network/PacketPortableTeleporter.java | 19 ++++--- .../common/network/PacketSecurityMode.java | 7 ++- .../common/network/PacketSecurityUpdate.java | 44 ++++++++++---- .../mekanism/common/security/IOwnerItem.java | 6 +- .../common/security/SecurityFrequency.java | 7 ++- .../tile/TileEntityQuantumEntangloporter.java | 18 +++--- .../common/tile/TileEntitySecurityDesk.java | 53 +++++++++-------- .../common/tile/TileEntityTeleporter.java | 18 +++--- .../tile/component/TileComponentSecurity.java | 57 ++++++++++++------- .../mekanism/common/util/RecipeUtils.java | 2 +- .../mekanism/common/util/SecurityUtils.java | 55 +++++++++--------- .../common/block/BlockGenerator.java | 2 +- .../common/item/ItemBlockGenerator.java | 20 ++++--- 31 files changed, 328 insertions(+), 221 deletions(-) diff --git a/src/main/java/mekanism/client/MekanismClient.java b/src/main/java/mekanism/client/MekanismClient.java index 311ce5f0a..42d0154e2 100644 --- a/src/main/java/mekanism/client/MekanismClient.java +++ b/src/main/java/mekanism/client/MekanismClient.java @@ -2,6 +2,7 @@ package mekanism.client; import java.util.HashMap; import java.util.Map; +import java.util.UUID; import mekanism.api.MekanismAPI; import mekanism.api.MekanismAPI.BoxBlacklistEvent; @@ -21,6 +22,7 @@ import net.minecraftforge.common.MinecraftForge; public class MekanismClient extends Mekanism { public static Map clientSecurityMap = new HashMap(); + public static Map clientUUIDMap = new HashMap(); public static VoiceClient voiceClient; @@ -40,6 +42,7 @@ public class MekanismClient extends Mekanism public static void reset() { clientSecurityMap.clear(); + clientUUIDMap.clear(); if(general.voiceServerEnabled) { diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index bcdb1174d..fc524719c 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -121,7 +121,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism public void updateButtons() { - if(tileEntity.getSecurity().getOwner() == null) + if(tileEntity.getSecurity().getClientOwner() == null) { return; } @@ -138,7 +138,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism else { for(Frequency freq : tileEntity.publicCache) { - text.add(freq.name + " (" + freq.owner + ")"); + text.add(freq.name + " (" + freq.clientOwner + ")"); } } @@ -166,7 +166,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism setButton.enabled = false; } - if(tileEntity.getSecurity().getOwner().equals(freq.owner)) + if(tileEntity.getSecurity().getOwnerUUID().equals(freq.ownerUUID)) { deleteButton.enabled = true; } @@ -290,7 +290,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism int yAxis = (mouseY-(height-ySize)/2); fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 4, 0x404040); - fontRendererObj.drawString(LangUtils.localize("gui.owner") + ": " + (tileEntity.getSecurity().getOwner() != null ? tileEntity.getSecurity().getOwner() : LangUtils.localize("gui.none")), 8, (ySize-96)+4, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.owner") + ": " + (tileEntity.getSecurity().getClientOwner() != null ? tileEntity.getSecurity().getClientOwner() : LangUtils.localize("gui.none")), 8, (ySize-96)+4, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.freq") + ":", 32, 81, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.security") + ":", 32, 91, 0x404040); diff --git a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java index 79eaae575..f0e193a74 100644 --- a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java +++ b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java @@ -96,7 +96,7 @@ public class GuiSecurityDesk extends GuiMekanism public void updateButtons() { - if(tileEntity.owner == null) + if(tileEntity.clientOwner == null) { return; } @@ -146,7 +146,7 @@ public class GuiSecurityDesk extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - if(tileEntity.frequency != null && tileEntity.owner != null && tileEntity.owner.equals(mc.player.getName())) + if(tileEntity.frequency != null && tileEntity.ownerUUID != null && tileEntity.clientOwner.equals(mc.player.getName())) { if(xAxis >= 123 && xAxis <= 134 && yAxis >= 68 && yAxis <= 79) { @@ -255,7 +255,7 @@ public class GuiSecurityDesk extends GuiMekanism int xAxis = (mouseX-(width-xSize)/2); int yAxis = (mouseY-(height-ySize)/2); - String ownerText = EnumColor.RED + tileEntity.owner != null ? (LangUtils.localize("gui.owner") + ": " + tileEntity.owner) : LangUtils.localize("gui.noOwner"); + String ownerText = EnumColor.RED + tileEntity.clientOwner != null ? (LangUtils.localize("gui.owner") + ": " + tileEntity.clientOwner) : LangUtils.localize("gui.noOwner"); fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 4, 0x404040); fontRendererObj.drawString(ownerText, (xSize - 7) - fontRendererObj.getStringWidth(ownerText), (ySize - 96) + 2, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); @@ -309,7 +309,7 @@ public class GuiSecurityDesk extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - if(tileEntity.frequency != null && tileEntity.owner != null && mc.player.getName().equals(tileEntity.owner)) + if(tileEntity.frequency != null && tileEntity.clientOwner != null && mc.player.getName().equals(tileEntity.clientOwner)) { drawTexturedModalRect(guiWidth + 145, guiHeight + 78, xSize + (tileEntity.frequency.override ? 0 : 6), 22, 6, 6); diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index b66deb399..831c7afcb 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -3,9 +3,11 @@ package mekanism.client.gui; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import java.util.UUID; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.client.MekanismClient; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; import mekanism.client.gui.element.GuiRedstoneControl; @@ -240,7 +242,7 @@ public class GuiTeleporter extends GuiMekanism else { for(Frequency freq : getPublicCache()) { - text.add(freq.name + " (" + freq.owner + ")"); + text.add(freq.name + " (" + freq.clientOwner + ")"); } } @@ -268,7 +270,7 @@ public class GuiTeleporter extends GuiMekanism setButton.enabled = false; } - if(getOwner().equals(freq.owner)) + if(getOwner().equals(freq.ownerUUID)) { deleteButton.enabled = true; } @@ -418,7 +420,7 @@ public class GuiTeleporter extends GuiMekanism int yAxis = (mouseY-(height-ySize)/2); fontRendererObj.drawString(getName(), (xSize/2)-(fontRendererObj.getStringWidth(getName())/2), 4, 0x404040); - fontRendererObj.drawString(LangUtils.localize("gui.owner") + ": " + (getOwner() != null ? getOwner() : LangUtils.localize("gui.none")), 8, !itemStack.isEmpty() ? ySize-12 : (ySize-96)+4, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.owner") + ": " + (getOwnerUsername() != null ? getOwnerUsername() : LangUtils.localize("gui.none")), 8, !itemStack.isEmpty() ? ySize-12 : (ySize-96)+4, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.freq") + ":", 32, 81, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.security") + ":", 32, 91, 0x404040); @@ -490,14 +492,25 @@ public class GuiTeleporter extends GuiMekanism return EnumColor.DARK_RED + LangUtils.localize("gui.teleporter.noLink"); } - private String getOwner() + private UUID getOwner() { if(tileEntity != null) { - return tileEntity.getSecurity().getOwner(); + return tileEntity.getSecurity().getOwnerUUID(); } else { - return ((IOwnerItem)itemStack.getItem()).getOwner(itemStack); + return ((IOwnerItem)itemStack.getItem()).getOwnerUUID(itemStack); + } + } + + private String getOwnerUsername() + { + if(tileEntity != null) + { + return tileEntity.getSecurity().getClientOwner(); + } + else { + return MekanismClient.clientUUIDMap.get(((IOwnerItem)itemStack.getItem()).getOwnerUUID(itemStack)); } } diff --git a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java index 9d58c5562..6d8bc8b77 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java @@ -1,5 +1,7 @@ package mekanism.client.gui.element; +import java.util.UUID; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.MekanismClient; @@ -98,7 +100,7 @@ public class GuiSecurityTab extends GuiElement { String securityDisplay = isItem ? SecurityUtils.getSecurityDisplay(getItem(), Side.CLIENT) : SecurityUtils.getSecurityDisplay(tileEntity, Side.CLIENT); String securityText = EnumColor.GREY + LangUtils.localize("gui.security") + ": " + securityDisplay; - String ownerText = SecurityUtils.getOwnerDisplay(mc.player.getName(), getOwner()); + String ownerText = SecurityUtils.getOwnerDisplay(mc.player, getOwnerUsername()); String overrideText = EnumColor.RED + "(" + LangUtils.localize("gui.overridden") + ")"; if(isItem ? SecurityUtils.isOverridden(getItem(), Side.CLIENT) : SecurityUtils.isOverridden(tileEntity, Side.CLIENT)) @@ -152,7 +154,7 @@ public class GuiSecurityTab extends GuiElement } } - private String getOwner() + private UUID getOwner() { if(isItem) { @@ -162,10 +164,27 @@ public class GuiSecurityTab extends GuiElement return null; } - return ((ISecurityItem)getItem().getItem()).getOwner(getItem()); + return ((ISecurityItem)getItem().getItem()).getOwnerUUID(getItem()); } else { - return ((ISecurityTile)tileEntity).getSecurity().getOwner(); + return ((ISecurityTile)tileEntity).getSecurity().getOwnerUUID(); + } + } + + private String getOwnerUsername() + { + if(isItem) + { + if(getItem().isEmpty() || !(getItem().getItem() instanceof ISecurityItem)) + { + mc.player.closeScreen(); + return null; + } + + return MekanismClient.clientUUIDMap.get(((ISecurityItem)getItem().getItem()).getOwnerUUID(getItem())); + } + else { + return ((ISecurityTile)tileEntity).getSecurity().getClientOwner(); } } diff --git a/src/main/java/mekanism/common/CommandMekanism.java b/src/main/java/mekanism/common/CommandMekanism.java index 54e710c08..e6b3294f5 100644 --- a/src/main/java/mekanism/common/CommandMekanism.java +++ b/src/main/java/mekanism/common/CommandMekanism.java @@ -120,7 +120,7 @@ public class CommandMekanism extends CommandBase { for(Frequency freq : Mekanism.publicTeleporters.getFrequencies()) { - sender.sendMessage(new TextComponentString(EnumColor.INDIGO + " - " + freq.name + EnumColor.GREY + " (" + freq.owner + ")")); + sender.sendMessage(new TextComponentString(EnumColor.INDIGO + " - " + freq.name + EnumColor.GREY + " (" + freq.ownerUUID + ")")); } } else { @@ -130,7 +130,7 @@ public class CommandMekanism extends CommandBase { for(Frequency freq : manager.getFrequencies()) { - sender.sendMessage(new TextComponentString(EnumColor.INDIGO + " - " + freq.name + EnumColor.GREY + " (" + freq.owner + ")")); + sender.sendMessage(new TextComponentString(EnumColor.INDIGO + " - " + freq.name + EnumColor.GREY + " (" + freq.ownerUUID + ")")); } } else { diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 8c3692a57..a04ec19cc 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -204,10 +204,10 @@ public class Mekanism /** FrequencyManagers for various networks */ public static FrequencyManager publicTeleporters = new FrequencyManager(Frequency.class, Frequency.TELEPORTER); - public static Map privateTeleporters = new HashMap(); + public static Map privateTeleporters = new HashMap(); public static FrequencyManager publicEntangloporters = new FrequencyManager(InventoryFrequency.class, InventoryFrequency.ENTANGLOPORTER); - public static Map privateEntangloporters = new HashMap(); + public static Map privateEntangloporters = new HashMap(); public static FrequencyManager securityFrequencies = new FrequencyManager(SecurityFrequency.class, SecurityFrequency.SECURITY); diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index ee8330260..75ce725de 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -1,6 +1,7 @@ package mekanism.common.block; import java.util.Random; +import java.util.UUID; import mekanism.api.Coord4D; import mekanism.api.energy.IEnergizedItem; @@ -453,13 +454,13 @@ public abstract class BlockBasic extends Block implements ICTMBlock } else if(tile instanceof TileEntitySecurityDesk) { - String owner = ((TileEntitySecurityDesk)tile).owner; + UUID ownerUUID = ((TileEntitySecurityDesk)tile).ownerUUID; if(!entityplayer.isSneaking()) { if(!world.isRemote) { - if(owner == null || entityplayer.getName().equals(owner)) + if(ownerUUID == null || entityplayer.getUniqueID().equals(ownerUUID)) { entityplayer.openGui(Mekanism.instance, 57, world, pos.getX(), pos.getY(), pos.getZ()); } @@ -813,7 +814,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock if(tileEntity instanceof TileEntitySecurityDesk) { - ((TileEntitySecurityDesk)tileEntity).owner = placer.getName(); + ((TileEntitySecurityDesk)tileEntity).ownerUUID = placer.getUniqueID(); } if(tileEntity instanceof IBoundingBlock) diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index 09c8cd7df..4585e88c9 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -302,7 +302,7 @@ public class BlockEnergyCube extends BlockContainer if(securityItem.hasSecurity(itemStack)) { - securityItem.setOwner(itemStack, ((ISecurityTile)tileEntity).getSecurity().getOwner()); + securityItem.setOwnerUUID(itemStack, ((ISecurityTile)tileEntity).getSecurity().getOwnerUUID()); securityItem.setSecurity(itemStack, ((ISecurityTile)tileEntity).getSecurity().getMode()); } } diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index 3eb204e27..79a39649b 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -291,7 +291,7 @@ public class BlockGasTank extends BlockContainer if(securityItem.hasSecurity(itemStack)) { - securityItem.setOwner(itemStack, ((ISecurityTile)tileEntity).getSecurity().getOwner()); + securityItem.setOwnerUUID(itemStack, ((ISecurityTile)tileEntity).getSecurity().getOwnerUUID()); securityItem.setSecurity(itemStack, ((ISecurityTile)tileEntity).getSecurity().getMode()); } } diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 478cc077e..f8933a00b 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -1,6 +1,7 @@ package mekanism.common.block; import java.util.Random; +import java.util.UUID; import mekanism.api.Coord4D; import mekanism.api.energy.IEnergizedItem; @@ -567,9 +568,9 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock case QUANTUM_ENTANGLOPORTER: if(!entityplayer.isSneaking()) { - String owner = ((ISecurityTile)tileEntity).getSecurity().getOwner(); + UUID owner = ((ISecurityTile)tileEntity).getSecurity().getOwnerUUID(); - if(MekanismUtils.isOp((EntityPlayerMP)entityplayer) || owner == null || entityplayer.getName().equals(owner)) + if(MekanismUtils.isOp((EntityPlayerMP)entityplayer) || owner == null || entityplayer.getUniqueID().equals(owner)) { entityplayer.openGui(Mekanism.instance, type.guiId, world, pos.getX(), pos.getY(), pos.getZ()); } @@ -888,7 +889,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock if(securityItem.hasSecurity(itemStack)) { - securityItem.setOwner(itemStack, ((ISecurityTile)tileEntity).getSecurity().getOwner()); + securityItem.setOwnerUUID(itemStack, ((ISecurityTile)tileEntity).getSecurity().getOwnerUUID()); securityItem.setSecurity(itemStack, ((ISecurityTile)tileEntity).getSecurity().getMode()); } } diff --git a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java index 3f11b992b..1fc76337b 100644 --- a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java +++ b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java @@ -3,6 +3,7 @@ package mekanism.common.content.entangloporter; import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import java.util.UUID; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; @@ -30,9 +31,9 @@ public class InventoryFrequency extends Frequency public NonNullList inventory = NonNullList.withSize(1, ItemStack.EMPTY); public double temperature; - public InventoryFrequency(String n, String o) + public InventoryFrequency(String n, UUID uuid) { - super(n, o); + super(n, uuid); storedFluid = new FluidTank(1000); storedGas = new GasTank(1000); diff --git a/src/main/java/mekanism/common/frequency/Frequency.java b/src/main/java/mekanism/common/frequency/Frequency.java index d4b6df755..b4d76e39e 100644 --- a/src/main/java/mekanism/common/frequency/Frequency.java +++ b/src/main/java/mekanism/common/frequency/Frequency.java @@ -5,17 +5,20 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.HashSet; import java.util.Set; +import java.util.UUID; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.UsernameCache; public class Frequency { public static final String TELEPORTER = "Teleporter"; public String name; - public String owner; + public UUID ownerUUID; + public String clientOwner; public boolean valid = true; @@ -23,10 +26,10 @@ public class Frequency public Set activeCoords = new HashSet(); - public Frequency(String n, String o) + public Frequency(String n, UUID uuid) { name = n; - owner = o; + ownerUUID = uuid; } public Frequency(NBTTagCompound nbtTags) @@ -100,28 +103,30 @@ public class Frequency public void write(NBTTagCompound nbtTags) { nbtTags.setString("name", name); - nbtTags.setString("owner", owner); + nbtTags.setString("ownerUUID", ownerUUID.toString()); nbtTags.setBoolean("publicFreq", publicFreq); } protected void read(NBTTagCompound nbtTags) { name = nbtTags.getString("name"); - owner = nbtTags.getString("owner"); + ownerUUID = UUID.fromString(nbtTags.getString("ownerUUID")); publicFreq = nbtTags.getBoolean("publicFreq"); } public void write(ArrayList data) { data.add(name); - data.add(owner); + data.add(ownerUUID.toString()); + data.add(UsernameCache.getLastKnownUsername(ownerUUID)); data.add(publicFreq); } protected void read(ByteBuf dataStream) { name = PacketHandler.readString(dataStream); - owner = PacketHandler.readString(dataStream); + ownerUUID = UUID.fromString(PacketHandler.readString(dataStream)); + clientOwner = PacketHandler.readString(dataStream); publicFreq = dataStream.readBoolean(); } @@ -130,7 +135,7 @@ public class Frequency { int code = 1; code = 31 * code + name.hashCode(); - code = 31 * code + owner.hashCode(); + code = 31 * code + ownerUUID.hashCode(); code = 31 * code + (publicFreq ? 1 : 0); return code; } @@ -139,6 +144,6 @@ public class Frequency public boolean equals(Object obj) { return obj instanceof Frequency && ((Frequency)obj).name.equals(name) - && ((Frequency)obj).owner.equals(owner) && ((Frequency)obj).publicFreq == publicFreq; + && ((Frequency)obj).ownerUUID.equals(ownerUUID) && ((Frequency)obj).publicFreq == publicFreq; } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index c567d965c..0a871b3c2 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -9,6 +9,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; +import java.util.UUID; import mekanism.api.Coord4D; import net.minecraft.nbt.NBTTagCompound; @@ -32,7 +33,7 @@ public class FrequencyManager private FrequencyDataHandler dataHandler; - private String owner; + private UUID ownerUUID; private String name; @@ -46,11 +47,11 @@ public class FrequencyManager managers.add(this); } - public FrequencyManager(Class c, String n, String s) + public FrequencyManager(Class c, String n, UUID uuid) { this(c, n); - owner = s; + ownerUUID = uuid; } public static void load(World world) @@ -63,7 +64,7 @@ public class FrequencyManager } } - public Frequency update(String user, Coord4D coord, Frequency freq) + public Frequency update(Coord4D coord, Frequency freq) { for(Frequency iterFreq : frequencies) { @@ -81,13 +82,13 @@ public class FrequencyManager return null; } - public void remove(String name, String owner) + public void remove(String name, UUID owner) { for(Iterator iter = getFrequencies().iterator(); iter.hasNext();) { Frequency iterFreq = iter.next(); - if(iterFreq.name.equals(name) && iterFreq.owner.equals(owner)) + if(iterFreq.name.equals(name) && iterFreq.ownerUUID.equals(owner)) { iter.remove(); dataHandler.markDirty(); @@ -117,7 +118,7 @@ public class FrequencyManager { Frequency iterFreq = iter.next(); - if(iterFreq.owner.equals(user)) + if(iterFreq.ownerUUID.equals(user)) { iter.remove(); dataHandler.markDirty(); @@ -137,7 +138,7 @@ public class FrequencyManager } } - public Frequency validateFrequency(String user, Coord4D coord, Frequency freq) + public Frequency validateFrequency(UUID uuid, Coord4D coord, Frequency freq) { for(Frequency iterFreq : frequencies) { @@ -150,7 +151,7 @@ public class FrequencyManager } } - if(user.equals(freq.owner)) + if(uuid.equals(freq.ownerUUID)) { freq.activeCoords.add(coord); freq.valid = true; @@ -306,7 +307,7 @@ public class FrequencyManager public String getName() { - return owner != null ? (owner + "_" + name + "FrequencyHandler") : (name + "FrequencyHandler"); + return ownerUUID != null ? (ownerUUID.toString() + "_" + name + "FrequencyHandler") : (name + "FrequencyHandler"); } public static void reset() @@ -325,7 +326,7 @@ public class FrequencyManager public FrequencyManager manager; public Set loadedFrequencies; - public String loadedOwner; + public UUID loadedOwner; public FrequencyDataHandler(String tagName) { @@ -342,7 +343,7 @@ public class FrequencyManager if(loadedFrequencies != null) { manager.frequencies = loadedFrequencies; - manager.owner = loadedOwner; + manager.ownerUUID = loadedOwner; } } @@ -354,7 +355,7 @@ public class FrequencyManager if(nbtTags.hasKey("owner")) { - loadedOwner = nbtTags.getString("owner"); + loadedOwner = UUID.fromString(nbtTags.getString("owner")); } NBTTagList list = nbtTags.getTagList("freqList", NBT.TAG_COMPOUND); @@ -380,9 +381,9 @@ public class FrequencyManager { nbtTags.setString("frequencyClass", manager.frequencyClass.getName()); - if(manager.owner != null) + if(manager.ownerUUID != null) { - nbtTags.setString("owner", manager.owner); + nbtTags.setString("owner", 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 9508b5435..02d931125 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -5,6 +5,7 @@ import ic2.api.item.ISpecialElectricItem; import java.util.ArrayList; import java.util.List; +import java.util.UUID; import mekanism.api.Coord4D; import mekanism.api.EnumColor; @@ -12,6 +13,7 @@ import mekanism.api.Range4D; import mekanism.api.energy.IEnergizedItem; import mekanism.api.transmitters.TransmissionType; import mekanism.client.MekKeyHandler; +import mekanism.client.MekanismClient; import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; @@ -84,7 +86,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS else { if(hasSecurity(itemstack)) { - list.add(SecurityUtils.getOwnerDisplay(entityplayer.getName(), getOwner(itemstack))); + list.add(SecurityUtils.getOwnerDisplay(entityplayer, MekanismClient.clientUUIDMap.get(getOwnerUUID(itemstack)))); list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack, Side.CLIENT)); if(SecurityUtils.isOverridden(itemstack, Side.CLIENT)) @@ -130,16 +132,16 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS if(tileEntity instanceof ISecurityTile) { ISecurityTile security = (ISecurityTile)tileEntity; - security.getSecurity().setOwner(getOwner(stack)); + security.getSecurity().setOwnerUUID(getOwnerUUID(stack)); if(hasSecurity(stack)) { security.getSecurity().setMode(getSecurity(stack)); } - if(getOwner(stack) == null) + if(getOwnerUUID(stack) == null) { - security.getSecurity().setOwner(player.getName()); + security.getSecurity().setOwnerUUID(player.getUniqueID()); } } @@ -329,26 +331,26 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS } @Override - public String getOwner(ItemStack stack) + public UUID getOwnerUUID(ItemStack stack) { if(ItemDataUtils.hasData(stack, "owner")) { - return ItemDataUtils.getString(stack, "owner"); + return UUID.fromString(ItemDataUtils.getString(stack, "owner")); } return null; } @Override - public void setOwner(ItemStack stack, String owner) + public void setOwnerUUID(ItemStack stack, UUID owner) { - if(owner == null || owner.isEmpty()) + if(owner == null) { ItemDataUtils.removeData(stack, "owner"); return; } - ItemDataUtils.setString(stack, "owner", owner); + ItemDataUtils.setString(stack, "owner", owner.toString()); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 5dea2da40..7a28fd900 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -2,6 +2,7 @@ package mekanism.common.item; import java.util.ArrayList; import java.util.List; +import java.util.UUID; import mekanism.api.Coord4D; import mekanism.api.EnumColor; @@ -11,6 +12,7 @@ import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; import mekanism.client.MekKeyHandler; +import mekanism.client.MekanismClient; import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; @@ -90,16 +92,16 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI if(tileEntity instanceof ISecurityTile) { ISecurityTile security = (ISecurityTile)tileEntity; - security.getSecurity().setOwner(getOwner(stack)); + security.getSecurity().setOwnerUUID(getOwnerUUID(stack)); if(hasSecurity(stack)) { security.getSecurity().setMode(getSecurity(stack)); } - if(getOwner(stack) == null) + if(getOwnerUUID(stack) == null) { - security.getSecurity().setOwner(player.getName()); + security.getSecurity().setOwnerUUID(player.getUniqueID()); } } @@ -149,7 +151,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI else { if(hasSecurity(itemstack)) { - list.add(SecurityUtils.getOwnerDisplay(entityplayer.getName(), getOwner(itemstack))); + list.add(SecurityUtils.getOwnerDisplay(entityplayer, MekanismClient.clientUUIDMap.get(getOwnerUUID(itemstack)))); list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack, Side.CLIENT)); if(SecurityUtils.isOverridden(itemstack, Side.CLIENT)) @@ -347,26 +349,26 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI } @Override - public String getOwner(ItemStack stack) + public UUID getOwnerUUID(ItemStack stack) { if(ItemDataUtils.hasData(stack, "owner")) { - return ItemDataUtils.getString(stack, "owner"); + return UUID.fromString(ItemDataUtils.getString(stack, "owner")); } return null; } @Override - public void setOwner(ItemStack stack, String owner) + public void setOwnerUUID(ItemStack stack, UUID owner) { - if(owner == null || owner.isEmpty()) + if(owner == null) { ItemDataUtils.removeData(stack, "owner"); return; } - ItemDataUtils.setString(stack, "owner", owner); + ItemDataUtils.setString(stack, "owner", owner.toString()); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index ab639c3cf..1c7f82062 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -6,12 +6,14 @@ import ic2.api.item.ISpecialElectricItem; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.UUID; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Range4D; import mekanism.api.energy.IEnergizedItem; import mekanism.client.MekKeyHandler; +import mekanism.client.MekanismClient; import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; @@ -216,7 +218,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { if(hasSecurity(itemstack)) { - list.add(SecurityUtils.getOwnerDisplay(entityplayer.getName(), getOwner(itemstack))); + list.add(SecurityUtils.getOwnerDisplay(entityplayer, MekanismClient.clientUUIDMap.get(getOwnerUUID(itemstack)))); list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack, Side.CLIENT)); if(SecurityUtils.isOverridden(itemstack, Side.CLIENT)) @@ -332,16 +334,16 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(tileEntity instanceof ISecurityTile) { ISecurityTile security = (ISecurityTile)tileEntity; - security.getSecurity().setOwner(getOwner(stack)); + security.getSecurity().setOwnerUUID(getOwnerUUID(stack)); if(hasSecurity(stack)) { security.getSecurity().setMode(getSecurity(stack)); } - if(getOwner(stack) == null) + if(getOwnerUUID(stack) == null) { - security.getSecurity().setOwner(player.getName()); + security.getSecurity().setOwnerUUID(player.getUniqueID()); } } @@ -464,9 +466,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { if(!world.isRemote) { - if(getOwner(itemstack) == null) + if(getOwnerUUID(itemstack) == null) { - setOwner(itemstack, entityplayer.getName()); + setOwnerUUID(itemstack, entityplayer.getUniqueID()); } if(SecurityUtils.canAccess(entityplayer, itemstack)) @@ -867,26 +869,26 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } @Override - public String getOwner(ItemStack stack) + public UUID getOwnerUUID(ItemStack stack) { if(ItemDataUtils.hasData(stack, "owner")) { - return ItemDataUtils.getString(stack, "owner"); + return UUID.fromString(ItemDataUtils.getString(stack, "owner")); } return null; } @Override - public void setOwner(ItemStack stack, String owner) + public void setOwnerUUID(ItemStack stack, UUID owner) { - if(owner == null || owner.isEmpty()) + if(owner == null) { ItemDataUtils.removeData(stack, "owner"); return; } - ItemDataUtils.setString(stack, "owner", owner); + ItemDataUtils.setString(stack, "owner", owner.toString()); } @Override diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index df11d890d..1e282c9a5 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -1,10 +1,14 @@ package mekanism.common.item; import java.util.List; +import java.util.UUID; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.client.MekanismClient; import mekanism.common.Mekanism; +import mekanism.common.network.PacketSecurityUpdate.SecurityPacket; +import mekanism.common.network.PacketSecurityUpdate.SecurityUpdateMessage; import mekanism.common.security.IOwnerItem; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; @@ -28,7 +32,7 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(SecurityUtils.getOwnerDisplay(entityplayer.getName(), getOwner(itemstack))); + list.add(SecurityUtils.getOwnerDisplay(entityplayer, MekanismClient.clientUUIDMap.get(getOwnerUUID(itemstack)))); if(getFrequency(itemstack) != null) { @@ -46,9 +50,10 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem if(!world.isRemote) { - if(getOwner(itemstack) == null) + if(getOwnerUUID(itemstack) == null) { - setOwner(itemstack, entityplayer.getName()); + setOwnerUUID(itemstack, entityplayer.getUniqueID()); + Mekanism.packetHandler.sendToAll(new SecurityUpdateMessage(SecurityPacket.UPDATE, entityplayer.getUniqueID(), null)); entityplayer.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("gui.nowOwn"))); } else { @@ -93,29 +98,29 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem } @Override - public String getOwner(ItemStack stack) + public UUID getOwnerUUID(ItemStack stack) { if(ItemDataUtils.hasData(stack, "owner")) { - return ItemDataUtils.getString(stack, "owner"); + return UUID.fromString(ItemDataUtils.getString(stack, "owner")); } return null; } @Override - public void setOwner(ItemStack stack, String owner) + public void setOwnerUUID(ItemStack stack, UUID owner) { setFrequency(stack, null); setPrivateMode(stack, false); - if(owner == null || owner.isEmpty()) + if(owner == null) { ItemDataUtils.removeData(stack, "owner"); return; } - ItemDataUtils.setString(stack, "owner", owner); + ItemDataUtils.setString(stack, "owner", owner.toString()); } @Override diff --git a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java index 9463baa15..644de1389 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java +++ b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java @@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.List; +import java.util.UUID; import mekanism.api.Coord4D; import mekanism.api.Range4D; @@ -57,7 +58,7 @@ public class PacketPortableTeleporter implements IMessageHandler privateFreqs = new ArrayList(); - for(Frequency f : getManager(player.getName(), world).getFrequencies()) + for(Frequency f : getManager(player.getUniqueID(), world).getFrequencies()) { privateFreqs.add(f); } @@ -168,7 +169,7 @@ public class PacketPortableTeleporter implements IMessageHandler(); securityMode = SecurityMode.PUBLIC; @@ -111,7 +113,6 @@ public class SecurityFrequency extends Frequency override = dataStream.readBoolean(); securityMode = SecurityMode.values()[dataStream.readInt()]; - trusted.clear(); int size = dataStream.readInt(); for(int i = 0; i < size; i++) diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 014a64e24..647d5d789 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -122,13 +122,13 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp { if(frequency != null && !frequency.valid) { - frequency = (InventoryFrequency)manager.validateFrequency(getSecurity().getOwner(), Coord4D.get(this), frequency); + frequency = (InventoryFrequency)manager.validateFrequency(getSecurity().getOwnerUUID(), Coord4D.get(this), frequency); markDirty(); } if(frequency != null) { - frequency = (InventoryFrequency)manager.update(getSecurity().getOwner(), Coord4D.get(this), frequency); + frequency = (InventoryFrequency)manager.update(Coord4D.get(this), frequency); if(frequency == null) { @@ -184,7 +184,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp public FrequencyManager getManager(Frequency freq) { - if(getSecurity().getOwner() == null || freq == null) + if(getSecurity().getOwnerUUID() == null || freq == null) { return null; } @@ -194,14 +194,14 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp return Mekanism.publicEntangloporters; } else { - if(!Mekanism.privateEntangloporters.containsKey(getSecurity().getOwner())) + if(!Mekanism.privateEntangloporters.containsKey(getSecurity().getOwnerUUID())) { - FrequencyManager manager = new FrequencyManager(InventoryFrequency.class, InventoryFrequency.ENTANGLOPORTER, getSecurity().getOwner()); - Mekanism.privateEntangloporters.put(getSecurity().getOwner(), manager); + FrequencyManager manager = new FrequencyManager(InventoryFrequency.class, InventoryFrequency.ENTANGLOPORTER, getSecurity().getOwnerUUID()); + Mekanism.privateEntangloporters.put(getSecurity().getOwnerUUID(), manager); manager.createOrLoad(world); } - return Mekanism.privateEntangloporters.get(getSecurity().getOwner()); + return Mekanism.privateEntangloporters.get(getSecurity().getOwnerUUID()); } } @@ -223,7 +223,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } } - Frequency freq = new InventoryFrequency(name, getSecurity().getOwner()).setPublic(publicFreq); + Frequency freq = new InventoryFrequency(name, getSecurity().getOwnerUUID()).setPublic(publicFreq); freq.activeCoords.add(Coord4D.get(this)); manager.addFrequency(freq); frequency = (InventoryFrequency)freq; @@ -282,7 +282,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp if(manager != null) { - manager.remove(freq, getSecurity().getOwner()); + manager.remove(freq, getSecurity().getOwnerUUID()); } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java index e00174166..bcccbe9d1 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java +++ b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java @@ -3,6 +3,7 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import java.util.UUID; import mekanism.api.Coord4D; import mekanism.common.Mekanism; @@ -22,13 +23,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; +import net.minecraftforge.common.UsernameCache; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntitySecurityDesk extends TileEntityContainerBlock implements IBoundingBlock { - public String owner; + public UUID ownerUUID; + public String clientOwner; public SecurityFrequency frequency; @@ -44,17 +47,17 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements { if(!world.isRemote) { - if(owner != null && frequency != null) + if(ownerUUID != null && frequency != null) { if(!inventory.get(0).isEmpty() && inventory.get(0).getItem() instanceof IOwnerItem) { IOwnerItem item = (IOwnerItem)inventory.get(0).getItem(); - if(item.hasOwner(inventory.get(0)) && item.getOwner(inventory.get(0)) != null) + if(item.hasOwner(inventory.get(0)) && item.getOwnerUUID(inventory.get(0)) != null) { - if(item.getOwner(inventory.get(0)).equals(owner)) + if(item.getOwnerUUID(inventory.get(0)).equals(ownerUUID)) { - item.setOwner(inventory.get(0), null); + item.setOwnerUUID(inventory.get(0), null); if(item instanceof ISecurityItem && ((ISecurityItem)item).hasSecurity(inventory.get(0))) { @@ -70,12 +73,12 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements if(item.hasOwner(inventory.get(1))) { - if(item.getOwner(inventory.get(1)) == null) + if(item.getOwnerUUID(inventory.get(1)) == null) { - item.setOwner(inventory.get(1), owner); + item.setOwnerUUID(inventory.get(1), ownerUUID); } - if(item.getOwner(inventory.get(1)).equals(owner)) + if(item.getOwnerUUID(inventory.get(1)).equals(ownerUUID)) { if(item instanceof ISecurityItem && ((ISecurityItem)item).hasSecurity(inventory.get(1))) { @@ -86,9 +89,9 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements } } - if(frequency == null && owner != null) + if(frequency == null && ownerUUID != null) { - setFrequency(owner); + setFrequency(ownerUUID); } FrequencyManager manager = getManager(frequency); @@ -97,12 +100,12 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements { if(frequency != null && !frequency.valid) { - frequency = (SecurityFrequency)manager.validateFrequency(owner, Coord4D.get(this), frequency); + frequency = (SecurityFrequency)manager.validateFrequency(ownerUUID, Coord4D.get(this), frequency); } if(frequency != null) { - frequency = (SecurityFrequency)manager.update(owner, Coord4D.get(this), frequency); + frequency = (SecurityFrequency)manager.update(Coord4D.get(this), frequency); } } else { @@ -113,7 +116,7 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements public FrequencyManager getManager(Frequency freq) { - if(owner == null || freq == null) + if(ownerUUID == null || freq == null) { return null; } @@ -121,14 +124,14 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements return Mekanism.securityFrequencies; } - public void setFrequency(String owner) + public void setFrequency(UUID owner) { FrequencyManager manager = Mekanism.securityFrequencies; manager.deactivate(Coord4D.get(this)); for(Frequency freq : manager.getFrequencies()) { - if(freq.owner.equals(owner)) + if(freq.ownerUUID.equals(owner)) { frequency = (SecurityFrequency)freq; frequency.activeCoords.add(Coord4D.get(this)); @@ -173,7 +176,7 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements { frequency.override = !frequency.override; - Mekanism.packetHandler.sendToAll(new SecurityUpdateMessage(SecurityPacket.UPDATE, owner, new SecurityData(frequency))); + Mekanism.packetHandler.sendToAll(new SecurityUpdateMessage(SecurityPacket.UPDATE, ownerUUID, new SecurityData(frequency))); } } else if(type == 3) @@ -182,7 +185,7 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements { frequency.securityMode = SecurityMode.values()[dataStream.readInt()]; - Mekanism.packetHandler.sendToAll(new SecurityUpdateMessage(SecurityPacket.UPDATE, owner, new SecurityData(frequency))); + Mekanism.packetHandler.sendToAll(new SecurityUpdateMessage(SecurityPacket.UPDATE, ownerUUID, new SecurityData(frequency))); } } @@ -197,10 +200,10 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements { if(dataStream.readBoolean()) { - owner = PacketHandler.readString(dataStream); + clientOwner = PacketHandler.readString(dataStream); } else { - owner = null; + clientOwner = null; } if(dataStream.readBoolean()) @@ -218,9 +221,9 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements { super.readFromNBT(nbtTags); - if(nbtTags.hasKey("owner")) + if(nbtTags.hasKey("ownerUUID")) { - owner = nbtTags.getString("owner"); + ownerUUID = UUID.fromString(nbtTags.getString("ownerUUID")); } if(nbtTags.hasKey("frequency")) @@ -235,9 +238,9 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements { super.writeToNBT(nbtTags); - if(owner != null) + if(ownerUUID != null) { - nbtTags.setString("owner", owner); + nbtTags.setString("ownerUUID", ownerUUID.toString()); } if(frequency != null) @@ -255,10 +258,10 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements { super.getNetworkedData(data); - if(owner != null) + if(ownerUUID != null) { data.add(true); - data.add(owner); + data.add(UsernameCache.getLastKnownUsername(ownerUUID)); } else { data.add(false); diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index eadd247ea..52857081a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -116,12 +116,12 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo { if(frequency != null && !frequency.valid) { - frequency = manager.validateFrequency(getSecurity().getOwner(), Coord4D.get(this), frequency); + frequency = manager.validateFrequency(getSecurity().getOwnerUUID(), Coord4D.get(this), frequency); } if(frequency != null) { - frequency = manager.update(getSecurity().getOwner(), Coord4D.get(this), frequency); + frequency = manager.update(Coord4D.get(this), frequency); } } else { @@ -192,7 +192,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo } } - Frequency freq = new Frequency(name, getSecurity().getOwner()).setPublic(publicFreq); + Frequency freq = new Frequency(name, getSecurity().getOwnerUUID()).setPublic(publicFreq); freq.activeCoords.add(Coord4D.get(this)); manager.addFrequency(freq); frequency = freq; @@ -202,7 +202,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo public FrequencyManager getManager(Frequency freq) { - if(getSecurity().getOwner() == null || freq == null) + if(getSecurity().getOwnerUUID() == null || freq == null) { return null; } @@ -212,14 +212,14 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo return Mekanism.publicTeleporters; } else { - if(!Mekanism.privateTeleporters.containsKey(getSecurity().getOwner())) + if(!Mekanism.privateTeleporters.containsKey(getSecurity().getOwnerUUID())) { - FrequencyManager manager = new FrequencyManager(Frequency.class, Frequency.TELEPORTER, getSecurity().getOwner()); - Mekanism.privateTeleporters.put(getSecurity().getOwner(), manager); + FrequencyManager manager = new FrequencyManager(Frequency.class, Frequency.TELEPORTER, getSecurity().getOwnerUUID()); + Mekanism.privateTeleporters.put(getSecurity().getOwnerUUID(), manager); manager.createOrLoad(world); } - return Mekanism.privateTeleporters.get(getSecurity().getOwner()); + return Mekanism.privateTeleporters.get(getSecurity().getOwnerUUID()); } } @@ -614,7 +614,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo if(manager != null) { - manager.remove(freq, getSecurity().getOwner()); + manager.remove(freq, getSecurity().getOwnerUUID()); } } diff --git a/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java index 50dc1bd4d..6c485cd92 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java @@ -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); diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index 873f54a1d..04e98a53f 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -150,7 +150,7 @@ public class RecipeUtils if(!itemstack.isEmpty() && itemstack.getItem() instanceof ISecurityItem) { - ((ISecurityItem)toReturn.getItem()).setOwner(toReturn, ((ISecurityItem)itemstack.getItem()).getOwner(itemstack)); + ((ISecurityItem)toReturn.getItem()).setOwnerUUID(toReturn, ((ISecurityItem)itemstack.getItem()).getOwnerUUID(itemstack)); ((ISecurityItem)toReturn.getItem()).setSecurity(toReturn, ((ISecurityItem)itemstack.getItem()).getSecurity(itemstack)); break; diff --git a/src/main/java/mekanism/common/util/SecurityUtils.java b/src/main/java/mekanism/common/util/SecurityUtils.java index d001ba77f..631bcef8a 100644 --- a/src/main/java/mekanism/common/util/SecurityUtils.java +++ b/src/main/java/mekanism/common/util/SecurityUtils.java @@ -1,5 +1,7 @@ package mekanism.common.util; +import java.util.UUID; + import mekanism.api.EnumColor; import mekanism.client.MekanismClient; import mekanism.common.Mekanism; @@ -14,6 +16,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.text.TextComponentString; +import net.minecraftforge.common.UsernameCache; import net.minecraftforge.fml.relauncher.Side; public final class SecurityUtils @@ -22,9 +25,9 @@ public final class SecurityUtils { if(!(stack.getItem() instanceof ISecurityItem) && stack.getItem() instanceof IOwnerItem) { - String owner = ((IOwnerItem)stack.getItem()).getOwner(stack); + UUID owner = ((IOwnerItem)stack.getItem()).getOwnerUUID(stack); - return owner == null || owner.equals(player.getName()); + return owner == null || owner.equals(player.getUniqueID()); } if(stack.isEmpty() || !(stack.getItem() instanceof ISecurityItem)) @@ -39,7 +42,7 @@ public final class SecurityUtils return true; } - return canAccess(security.getSecurity(stack), player.getName(), security.getOwner(stack)); + return canAccess(security.getSecurity(stack), player, security.getOwnerUUID(stack)); } public static boolean canAccess(EntityPlayer player, TileEntity tile) @@ -56,12 +59,12 @@ public final class SecurityUtils return true; } - return canAccess(security.getSecurity().getMode(), player.getName(), security.getSecurity().getOwner()); + return canAccess(security.getSecurity().getMode(), player, security.getSecurity().getOwnerUUID()); } - private static boolean canAccess(SecurityMode mode, String username, String owner) + private static boolean canAccess(SecurityMode mode, EntityPlayer player, UUID owner) { - if(owner == null || username.equals(owner)) + if(owner == null || player.getUniqueID().equals(owner)) { return true; } @@ -84,7 +87,7 @@ public final class SecurityUtils } else if(mode == SecurityMode.TRUSTED) { - if(freq.trusted.contains(username)) + if(freq.trusted.contains(player.getName())) { return true; } @@ -93,13 +96,13 @@ public final class SecurityUtils return false; } - public static SecurityFrequency getFrequency(String owner) + public static SecurityFrequency getFrequency(UUID uuid) { - if(owner != null) + if(uuid != null) { for(Frequency f : Mekanism.securityFrequencies.getFrequencies()) { - if(f instanceof SecurityFrequency && f.owner.equals(owner)) + if(f instanceof SecurityFrequency && f.ownerUUID.equals(uuid)) { return (SecurityFrequency)f; } @@ -109,14 +112,14 @@ public final class SecurityUtils return null; } - public static String getOwnerDisplay(String user, String owner) + public static String getOwnerDisplay(EntityPlayer player, String ownerName) { - if(owner == null) + if(ownerName == null) { return EnumColor.RED + LangUtils.localize("gui.noOwner"); } - return EnumColor.GREY + LangUtils.localize("gui.owner") + ": " + (user.equals(owner) ? EnumColor.BRIGHT_GREEN : EnumColor.RED) + owner; + return EnumColor.GREY + LangUtils.localize("gui.owner") + ": " + (player.getName().equals(ownerName) ? EnumColor.BRIGHT_GREEN : EnumColor.RED) + ownerName; } public static void displayNoAccess(EntityPlayer player) @@ -137,7 +140,7 @@ public final class SecurityUtils } else if(side == Side.CLIENT) { - SecurityData data = MekanismClient.clientSecurityMap.get(security.getSecurity().getOwner()); + SecurityData data = MekanismClient.clientSecurityMap.get(security.getSecurity().getOwnerUUID()); if(data != null && data.override) { @@ -153,11 +156,11 @@ public final class SecurityUtils ISecurityItem security = (ISecurityItem)stack.getItem(); SecurityMode mode = security.getSecurity(stack); - if(security.getOwner(stack) != null) + if(security.getOwnerUUID(stack) != null) { if(side == Side.SERVER) { - SecurityFrequency freq = getFrequency(security.getOwner(stack)); + SecurityFrequency freq = getFrequency(security.getOwnerUUID(stack)); if(freq != null && freq.override) { @@ -166,7 +169,7 @@ public final class SecurityUtils } else if(side == Side.CLIENT) { - SecurityData data = MekanismClient.clientSecurityMap.get(security.getOwner(stack)); + SecurityData data = MekanismClient.clientSecurityMap.get(security.getOwnerUUID(stack)); if(data != null && data.override) { @@ -183,11 +186,11 @@ public final class SecurityUtils ISecurityTile security = (ISecurityTile)tile; SecurityMode mode = security.getSecurity().getMode(); - if(security.getSecurity().getOwner() != null) + if(security.getSecurity().getOwnerUUID() != null) { if(side == Side.SERVER) { - SecurityFrequency freq = getFrequency(security.getSecurity().getOwner()); + SecurityFrequency freq = getFrequency(security.getSecurity().getOwnerUUID()); if(freq != null && freq.override) { @@ -196,7 +199,7 @@ public final class SecurityUtils } else if(side == Side.CLIENT) { - SecurityData data = MekanismClient.clientSecurityMap.get(security.getSecurity().getOwner()); + SecurityData data = MekanismClient.clientSecurityMap.get(security.getSecurity().getClientOwner()); if(data != null && data.override) { @@ -212,19 +215,19 @@ public final class SecurityUtils { ISecurityItem security = (ISecurityItem)stack.getItem(); - if(security.getOwner(stack) == null) + if(security.getOwnerUUID(stack) == null) { return false; } if(side == Side.SERVER) { - SecurityFrequency freq = getFrequency(security.getOwner(stack)); + SecurityFrequency freq = getFrequency(security.getOwnerUUID(stack)); return freq != null && freq.override; } else { - SecurityData data = MekanismClient.clientSecurityMap.get(security.getOwner(stack)); + SecurityData data = MekanismClient.clientSecurityMap.get(security.getOwnerUUID(stack)); return data != null && data.override; } @@ -234,19 +237,19 @@ public final class SecurityUtils { ISecurityTile security = (ISecurityTile)tile; - if(security.getSecurity().getOwner() == null) + if(security.getSecurity().getOwnerUUID() == null) { return false; } if(side == Side.SERVER) { - SecurityFrequency freq = getFrequency(security.getSecurity().getOwner()); + SecurityFrequency freq = getFrequency(security.getSecurity().getOwnerUUID()); return freq != null && freq.override; } else { - SecurityData data = MekanismClient.clientSecurityMap.get(security.getSecurity().getOwner()); + SecurityData data = MekanismClient.clientSecurityMap.get(security.getSecurity().getClientOwner()); return data != null && data.override; } diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 387bb469f..f9fc63dbb 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -648,7 +648,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock if(securityItem.hasSecurity(itemStack)) { - securityItem.setOwner(itemStack, ((ISecurityTile)tileEntity).getSecurity().getOwner()); + securityItem.setOwnerUUID(itemStack, ((ISecurityTile)tileEntity).getSecurity().getOwnerUUID()); securityItem.setSecurity(itemStack, ((ISecurityTile)tileEntity).getSecurity().getMode()); } } diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 6ab42fdab..ddc79e6a0 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -4,10 +4,12 @@ import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; import java.util.List; +import java.util.UUID; import mekanism.api.EnumColor; import mekanism.api.energy.IEnergizedItem; import mekanism.client.MekKeyHandler; +import mekanism.client.MekanismClient; import mekanism.client.MekanismKeyHandler; import mekanism.common.base.ISustainedData; import mekanism.common.base.ISustainedInventory; @@ -129,7 +131,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp { if(hasSecurity(itemstack)) { - list.add(SecurityUtils.getOwnerDisplay(entityplayer.getName(), getOwner(itemstack))); + list.add(SecurityUtils.getOwnerDisplay(entityplayer, MekanismClient.clientUUIDMap.get(getOwnerUUID(itemstack)))); list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack, Side.CLIENT)); if(SecurityUtils.isOverridden(itemstack, Side.CLIENT)) @@ -216,16 +218,16 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp if(tileEntity instanceof ISecurityTile) { ISecurityTile security = (ISecurityTile)tileEntity; - security.getSecurity().setOwner(getOwner(stack)); + security.getSecurity().setOwnerUUID(getOwnerUUID(stack)); if(hasSecurity(stack)) { security.getSecurity().setMode(getSecurity(stack)); } - if(getOwner(stack) == null) + if(getOwnerUUID(stack) == null) { - security.getSecurity().setOwner(player.getName()); + security.getSecurity().setOwnerUUID(player.getUniqueID()); } } @@ -416,26 +418,26 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp } @Override - public String getOwner(ItemStack stack) + public UUID getOwnerUUID(ItemStack stack) { if(ItemDataUtils.hasData(stack, "owner")) { - return ItemDataUtils.getString(stack, "owner"); + return UUID.fromString(ItemDataUtils.getString(stack, "owner")); } return null; } @Override - public void setOwner(ItemStack stack, String owner) + public void setOwnerUUID(ItemStack stack, UUID owner) { - if(owner == null || owner.isEmpty()) + if(owner == null) { ItemDataUtils.removeData(stack, "owner"); return; } - ItemDataUtils.setString(stack, "owner", owner); + ItemDataUtils.setString(stack, "owner", owner.toString()); } @Override