diff --git a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java index 2ae14914..531a2e64 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java @@ -198,9 +198,9 @@ public class BlockHyperCube extends BlockEio implements IGuiHandler, IResourceTo return null; } - UUID user = null; + String user = null; if(!tag.getBoolean("channelIsPublic")) { - user = UUID.fromString(tag.getString("channelUser")); + user = tag.getString("channelUser"); } return new Channel(channelName, user); diff --git a/src/main/java/crazypants/enderio/machine/hypercube/Channel.java b/src/main/java/crazypants/enderio/machine/hypercube/Channel.java index 79050866..b329c0e5 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/Channel.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/Channel.java @@ -5,9 +5,9 @@ import java.util.UUID; public class Channel { final String name; - final UUID user; + final String user; - Channel(String name, UUID uuid) { + Channel(String name, String uuid) { this.name = trim(name); this.user = uuid; } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java index b0712201..3b8434be 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java @@ -270,7 +270,7 @@ public class GuiHyperCube extends GuiScreenBase { Channel c; if(privateButton.isSelected()) { - c = new Channel(newChannelTF.getText(), Minecraft.getMinecraft().thePlayer.getGameProfile().getId()); + c = new Channel(newChannelTF.getText(), Minecraft.getMinecraft().thePlayer.getGameProfile().getName()); } else { c = new Channel(newChannelTF.getText(), null); } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java index 20f22aa2..9eac603a 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java @@ -33,7 +33,7 @@ public class HyperCubeConfig { private final List publicChannels = new ArrayList(); - private final Map> userChannels = new HashMap>(); + private final Map> userChannels = new HashMap>(); private final File file; @@ -53,11 +53,11 @@ public class HyperCubeConfig { publicChannels.addAll(chans); } - public Map> getUserChannels() { + public Map> getUserChannels() { return userChannels; } - public void setUserChannels(Map> channels) { + public void setUserChannels(Map> channels) { userChannels.clear(); userChannels.putAll(channels); } @@ -68,10 +68,10 @@ public class HyperCubeConfig { setChannelListProperty(KEY_PUBLIC_CHANNELS, publicChannels); StringBuilder userListStr = new StringBuilder(); - Iterator>> itr = userChannels.entrySet().iterator(); + Iterator>> itr = userChannels.entrySet().iterator(); while (itr.hasNext()) { - Entry> entry = itr.next(); - UUID user = entry.getKey(); + Entry> entry = itr.next(); + String user = entry.getKey(); List channels = entry.getValue(); if(user != null && channels != null && !channels.isEmpty()) { @@ -134,15 +134,15 @@ public class HyperCubeConfig { loadChannelList(KEY_PUBLIC_CHANNELS, null, publicChannels); userChannels.clear(); - List users = new ArrayList(); + List users = new ArrayList(); String usersStr = props.getProperty(KEY_USERS, ""); String[] usersSplit = usersStr.split(DELIM); for (String user : usersSplit) { if(user != null) { - users.add(UUID.fromString(user)); + users.add(user); } } - for (UUID user : users) { + for (String user : users) { List channels = new ArrayList(); loadChannelList(user + KEY_USER_CHANNEL, user, channels); if(!channels.isEmpty()) { @@ -152,7 +152,7 @@ public class HyperCubeConfig { } - private void loadChannelList(String key, UUID user, List channels) { + private void loadChannelList(String key, String user, List channels) { String chans = props.getProperty(key, ""); //chans = chans.replaceAll(DELIM_ESC, DELIM); String[] chanSplit = chans.split(DELIM); diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java index 969c9fca..46a8c3cc 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRegister.java @@ -24,7 +24,7 @@ public class HyperCubeRegister { private final List publicChannels = new ArrayList(); private final List publicChannelsRO = Collections.unmodifiableList(publicChannels); - private final Map> userChannels = new HashMap>(); + private final Map> userChannels = new HashMap>(); //private Configuration config; private HyperCubeConfig conf; @@ -45,7 +45,7 @@ public class HyperCubeRegister { userChannels.putAll(conf.getUserChannels()); } - public synchronized List getChannelsForUser(UUID user) { + public synchronized List getChannelsForUser(String user) { List result = userChannels.get(user); if(result == null) { result = new ArrayList(); diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java index 54813290..d36f13a5 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketAddRemoveChannel.java @@ -44,7 +44,7 @@ public class PacketAddRemoveChannel implements IMessage, IMessageHandler channels; - private UUID userId; + private String userId; public PacketChannelList() { } public PacketChannelList(EntityPlayer player, boolean isPrivate) { - this(player.getGameProfile().getId(), isPrivate); + this(player.getGameProfile().getName(), isPrivate); } - public PacketChannelList(UUID uuid, boolean isPrivate) { + public PacketChannelList(String uuid, boolean isPrivate) { this.userId = uuid; this.isPrivate = isPrivate; if(isPrivate && uuid == null) { @@ -63,7 +63,7 @@ public class PacketChannelList implements IMessage, IMessageHandler 0) { if(user != null && user.trim().length() > 0) { - selectedChannel = new Channel(name, UUID.fromString(user)); + selectedChannel = new Channel(name, user); } else { selectedChannel = new Channel(name, null); } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java index d2603871..5f2437d6 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java @@ -841,7 +841,7 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerRecept String channelName = nbtRoot.getString("channelName"); String channelUser = nbtRoot.getString("channelUser"); if(channelName != null && !channelName.isEmpty()) { - channel = new Channel(channelName, channelUser == null || channelUser.isEmpty() ? null : UUID.fromString(channelUser)); + channel = new Channel(channelName, channelUser == null || channelUser.isEmpty() ? null : channelUser); } else { channel = null; }