Switched to storing UUID instead of username, with Offline Mode compatibility

This commit is contained in:
Katrina Swales committed 2015-02-06 00:42:47 +01:00
1 parent ba76cb4c0b
commit 60ded66263
17 files changed
+167 -86

No files matched your search

@@ -14,6 +14,7 @@ import java.util.Map.Entry;
import java.util.Properties;
import java.util.UUID;
import crazypants.util.PlayerUtil;
import org.apache.commons.io.IOUtils;
import crazypants.enderio.Log;
@@ -33,7 +34,7 @@ public class HyperCubeConfig {
private final List<Channel> publicChannels = new ArrayList<Channel>();
private final Map<String, List<Channel>> userChannels = new HashMap<String, List<Channel>>();
private final Map<UUID, List<Channel>> userChannels = new HashMap<UUID, List<Channel>>();
private final File file;
@@ -53,11 +54,11 @@ public class HyperCubeConfig {
publicChannels.addAll(chans);
}
public Map<String, List<Channel>> getUserChannels() {
public Map<UUID, List<Channel>> getUserChannels() {
return userChannels;
}
public void setUserChannels(Map<String, List<Channel>> channels) {
public void setUserChannels(Map<UUID, List<Channel>> channels) {
userChannels.clear();
userChannels.putAll(channels);
}
@@ -68,10 +69,10 @@ public class HyperCubeConfig {
setChannelListProperty(KEY_PUBLIC_CHANNELS, publicChannels);
StringBuilder userListStr = new StringBuilder();
Iterator<Entry<String, List<Channel>>> itr = userChannels.entrySet().iterator();
Iterator<Entry<UUID, List<Channel>>> itr = userChannels.entrySet().iterator();
while (itr.hasNext()) {
Entry<String, List<Channel>> entry = itr.next();
String user = entry.getKey();
Entry<UUID, List<Channel>> entry = itr.next();
UUID user = entry.getKey();
List<Channel> channels = entry.getValue();
if(user != null && channels != null && !channels.isEmpty()) {
@@ -142,17 +143,19 @@ public class HyperCubeConfig {
users.add(user);
}
}
for (String user : users) {
List<Channel> channels = new ArrayList<Channel>();
loadChannelList(user + KEY_USER_CHANNEL, user, channels);
UUID uuid=PlayerUtil.getPlayerUIDUnstable(user);
loadChannelList(user + KEY_USER_CHANNEL, uuid, channels);
if(!channels.isEmpty()) {
userChannels.put(user, channels);
userChannels.put(uuid, channels);
}
}
}
private void loadChannelList(String key, String user, List<Channel> channels) {
private void loadChannelList(String key, UUID user, List<Channel> channels) {
String chans = props.getProperty(key, "");
//chans = chans.replaceAll(DELIM_ESC, DELIM);
String[] chanSplit = chans.split(DELIM);