TotalFreedomMod May Update

Bump version
2025-07-01 04:26:42 +00:00 · 2021-06-06 14:06:01 +10:00 · 2021-05-27 11:35:11 +10:00
63 changed files with 616 additions and 1041 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -1,19 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-
-  # Maintain Maven Updates
-  - package-ecosystem: "maven" # See documentation for possible values
-    directory: "/" # Location of package manifests
-    schedule:
-      interval: "daily"
-      
-  # Maintain dependencies for GitHub Actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
--- a/.github/workflows/downstream.yml
+++ b/.github/workflows/downstream.yml
@ -1,43 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-
-name: Downstream Branch Updates
-
-on:
-  schedule:
-    - cron:  '20 7 * * *'
-    # scheduled at 07:00 every Monday and Thursday
-
-  workflow_dispatch:  # click the button on Github repo!
-
-
-jobs:
-  sync_with_upstream:
-    runs-on: ubuntu-latest
-    name: Sync main with upstream latest
-
-    steps:
-    # Step 1: run a standard checkout action, provided by github
-    - name: Checkout main
-      uses: actions/checkout@v2
-      with:
-        ref: main
-        # submodules: 'recursive'     ### may be needed in your situation
-
-    # Step 2: run this sync action - specify the upstream repo, upstream branch to sync with, and target sync branch
-    - name: Pull (Fast-Forward) upstream changes
-      id: sync
-      uses: aormsby/Fork-Sync-With-Upstream-action@v2.1
-      with:
-        upstream_repository: AtlasMediaGroup/TotalFreedomMod
-        upstream_branch: main
-        target_branch: main
-        git_pull_args: --ff-only                    # optional arg use, defaults to simple 'pull'
-
-    # Step 3: Display a message if 'sync' step had new commits (simple test)
-    - name: Check for new commits
-      if: steps.sync.outputs.has_new_commits
-      run: echo "There were new commits."
-
-    # Step 4: Print a helpful timestamp for your records (not required, just nice)
-    - name: Timestamp
-      run: date
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@ -8,20 +8,10 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    # Java 11 Builds
    - uses: actions/checkout@v1
-    - name: Set up JDK 11
+    - name: Set up JDK 1.8
      uses: actions/setup-java@v1
      with:
        java-version: 11
    - name: Build with Maven
      run: mvn -B package --file pom.xml
-
-    # Java 16 Builds
-    - uses: actions/checkout@v1
-    - name: Set up JDK 16
-      uses: actions/setup-java@v1
-      with:
-        java-version: 16
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,13 @@
+language: java
+jdk:
+  - oraclejdk11
+  - openjdk11
+notifications:
+  email: false
+addons:
+  apt:
+    packages:
+      - sshpass
+script: mvn clean install
+after_success:
+  - ./travis-upload.sh
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# TotalFreedomMod [![Maven-Build](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/maven.yml/badge.svg)](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/maven.yml) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/29c0f964da304666bd654bc7b1d556db)](https://www.codacy.com/gh/AtlasMediaGroup/TotalFreedomMod/dashboard?utm_source=github.com&utm_medium=referral&utm_content=AtlasMediaGroup/TotalFreedomMod&utm_campaign=Badge_Grade) [![CodeQL](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/codeql-analysis.yml)
+# TotalFreedomMod [![Build Status](https://travis-ci.com/AtlasMediaGroup/TotalFreedomMod.svg?branch=development)](https://travis-ci.com/AtlasMediaGroup/TotalFreedomMod) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/29c0f964da304666bd654bc7b1d556db)](https://www.codacy.com/gh/AtlasMediaGroup/TotalFreedomMod/dashboard?utm_source=github.com&utm_medium=referral&utm_content=AtlasMediaGroup/TotalFreedomMod&utm_campaign=Badge_Grade)

 TotalFreedomMod is a CraftBukkit server plugin designed primarily to support the [Official TotalFreedom Minecraft Server](https://totalfreedom.me/). However, you are more than welcome to adapt the source for your own server.

@ -14,4 +14,4 @@ For information on our security policy and reporting an issue, please see [SECUR

 ### Compiling

-You need Maven to build. You'd also need to set the JDK version to Java 11 as that is the current standard as of now.
+You need Maven to build. You'd also need to set the JDK version to Java 8 as that is the current standard as of now.
--- a/SECURITY.md
+++ b/SECURITY.md
@ -2,34 +2,18 @@

 ## Supported Versions

-We currently support the code running on the "main" branch and "development" branch of this repository. This is supported in addition to those formal releases, but note anything not yet released should be treated as in-development.
+We currently support the code running on the "development" branch of this repository. This is supported in addition to those formal releases, but note anything not yet released should be treated as in-development.

-In terms of plugin releases, our support matrix is as follows:
+In terms of plugin releases, we support the following versions:

-### Actively Supported
-These versions are currently actively supported by our team, and you should expect security patches where appropriate for these versions. 
-
-| Version             | Supported          | Support End:                   |
-| ------------------- | ------------------ | ------------------------------ |
-| 2021.05             | :white_check_mark: | No Earlier than August 2021    |
-
-### Legacy Supported
-These versions are no longer under active development, however we will look to release critical secuirty patches where appropriate. 
-
-| Version             | Supported          | Support End: |
-| ------------------- | ------------------ | ------------ |
-| 2021.04             | :white_check_mark: | July 2021    |
-
-### No Longer Supported
-These versions are no longer supported at all. It is strongly advised to update if you are running any of these versions. 
-
-| Version             | Supported          | Support Ended:      |
-| ------------------- | ------------------ | ------------------- |
-| 2021.02             | :x:                | 6 June 2021         |
-| 2020.11             | :x:                | 3 May 2021          |
-| 6.0.x (Pre-Release) | :x:                | December 2020       |
-| < 2020.11           | :x:                | December 2020       |
-| < 5.x               | :x:                | December 2020       |
+| Version             | Supported          |
+| ------------------- | ------------------ |
+| 2021.04             | :white_check_mark: |
+| 2021.02             | :white_check_mark: |
+| 2020.11             | :white_check_mark: |
+| 6.0.x (Pre-Release) | :x:                |
+| < 2020.11           | :x:                |
+| < 5.x               | :x:                |

 ## Reporting a Vulnerability

--- a/pom.xml
+++ b/pom.xml
@ -14,8 +14,6 @@
        <jar.finalName>${project.name}</jar.finalName>
        <timestamp>${maven.build.timestamp}</timestamp>
        <maven.build.timestamp.format>MM/dd/yyyy HH:mm</maven.build.timestamp.format>
-
-        <tfguilds.version>master-4ec00d977c-1</tfguilds.version>
    </properties>

    <name>TotalFreedomMod</name>
@ -107,6 +105,11 @@
            <url>https://papermc.io/repo/repository/maven-public/</url>
        </repository>

+        <repository>
+            <id>rayzr-repo</id>
+            <url>https://cdn.rawgit.com/Rayzr522/maven-repo/master/</url>
+        </repository>
+
        <repository>
            <id>ess-repo</id>
            <url>https://ci.ender.zone/plugin/repository/everything/</url>
@ -165,9 +168,9 @@
        </dependency>

        <dependency>
-            <groupId>com.github.AtlasMediaGroup</groupId>
+            <groupId>com.github.TotalFreedomMC</groupId>
            <artifactId>TF-LibsDisguises</artifactId>
-            <version>5a340341b0</version>
+            <version>48f01cf2fe</version>
            <scope>provided</scope>
        </dependency>

@ -213,6 +216,13 @@
            <scope>compile</scope>
        </dependency>

+        <dependency>
+            <groupId>me.rayzr522</groupId>
+            <artifactId>jsonmessage</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+
        <dependency>
            <groupId>com.github.vexsoftware</groupId>
            <artifactId>votifier</artifactId>
@ -244,7 +254,7 @@
        <dependency>
            <groupId>com.github.AtlasMediaGroup</groupId>
            <artifactId>TFGuilds</artifactId>
-            <version>${tfguilds.version}</version>
+            <version>master-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>

@ -272,18 +282,6 @@
            <artifactId>org.eclipse.sisu.inject</artifactId>
            <version>0.3.4</version>
        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents.client5</groupId>
-            <artifactId>httpclient5</artifactId>
-            <version>5.0.1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20210307</version>
-            <scope>compile</scope>
-        </dependency>
    </dependencies>

    <build>
@ -456,12 +454,11 @@
                                    <include>commons-codec:commons-codec</include>
                                    <include>org.reflections:reflections</include>
                                    <include>org.javassist:javassist</include>
+                                    <include>me.rayzr522:jsonmessage</include>
                                    <include>io.papermc:paperlib</include>
                                    <include>com.github.speedxx:Mojangson</include>
                                    <include>org.bstats:bstats-bukkit</include>
                                    <include>org.jetbrains:annotations</include>
-                                    <includes>org.apache.httpcomponents.client5:httpclient5</includes>
-                                    <includes>org.apache.httpcomponents.core5:httpcore5</includes>
                                </includes>
                            </artifactSet>
                        </configuration>
--- a/src/main/java/me/totalfreedom/totalfreedommod/AutoEject.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/AutoEject.java
@ -85,10 +85,6 @@ public class AutoEject extends FreedomService
                player.kickPlayer(kickMessage);
                break;
            }
-            default:
-            {
-                FLog.warning("Unrecognized EjectMethod " + method.name() + " found, defaulting to STRIKE_THREE");
-            }
            case STRIKE_THREE:
            {
                plugin.bm.addBan(Ban.forPlayerFuzzy(player, Bukkit.getConsoleSender(), null, kickMessage));
--- a/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java
@ -126,7 +126,7 @@ public class ChatManager extends FreedomService
        boolean mentionEveryone = ChatColor.stripColor(message).toLowerCase().contains("@everyone") && plugin.al.isAdmin(player);
        for (Player p : server.getOnlinePlayers())
        {
-            if ((ChatColor.stripColor(message).toLowerCase().contains("@" + p.getName().toLowerCase()) || mentionEveryone) && !event.isCancelled())
+            if (ChatColor.stripColor(message).toLowerCase().contains("@" + p.getName().toLowerCase()) || mentionEveryone)
            {
                p.playSound(p.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, SoundCategory.MASTER, 1337F, 0.9F);
            }
--- a/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java
@ -25,6 +25,11 @@ public class CommandSpy extends FreedomService
        {
            if (plugin.al.isAdmin(player) && plugin.al.getAdmin(player).getCommandSpy())
            {
+                if (plugin.al.isAdmin(event.getPlayer()) && !plugin.al.isSeniorAdmin(player))
+                {
+                    continue;
+                }
+
                if (player != event.getPlayer())
                {
                    FUtil.playerMsg(player, event.getPlayer().getName() + ": " + event.getMessage());
--- a/src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java
@ -2,8 +2,6 @@ package me.totalfreedom.totalfreedommod;

 import java.util.Arrays;
 import java.util.List;
-
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.Groups;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@ -35,10 +33,7 @@ public class EntityWiper extends FreedomService
            @Override
            public void run()
            {
-                if (ConfigEntry.AUTO_ENTITY_WIPE.getBoolean())
-                {
-                    wipeEntities(false);
-                }
+                wipeEntities(false);
            }
        }.runTaskTimer(plugin, 600L, 600L); // 30 second delay after startup + run every 30 seconds
    }
--- a/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java
@ -4,6 +4,7 @@ import io.papermc.lib.PaperLib;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
+import me.rayzr522.jsonmessage.JSONMessage;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
--- a/src/main/java/me/totalfreedom/totalfreedommod/Muter.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/Muter.java
@ -2,8 +2,6 @@ package me.totalfreedom.totalfreedommod;

 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
-
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.util.FLog;
@ -20,7 +18,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
 public class Muter extends FreedomService
 {

-    public final List<UUID> MUTED_PLAYERS = new ArrayList<>();
+    public final List<String> MUTED_PLAYERS = new ArrayList<>();

    @Override
    public void onStart()
@ -47,7 +45,7 @@ public class Muter extends FreedomService
        if (plugin.al.isAdminSync(player))
        {
            fPlayer.setMuted(false);
-            MUTED_PLAYERS.remove(player.getUniqueId());
+            MUTED_PLAYERS.remove(player.getName());
            return;
        }

@ -107,7 +105,7 @@ public class Muter extends FreedomService
        Player player = event.getPlayer();
        FPlayer playerdata = plugin.pl.getPlayer(player);

-        if (MUTED_PLAYERS.contains(player.getUniqueId()))
+        if (MUTED_PLAYERS.contains(player.getName()))
        {
            playerdata.setMuted(true);
        }
--- a/src/main/java/me/totalfreedom/totalfreedommod/admin/ActivityLog.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/ActivityLog.java
@ -2,8 +2,6 @@ package me.totalfreedom.totalfreedommod.admin;

 import com.google.common.collect.Maps;
 import java.util.Map;
-import java.util.UUID;
-
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.YamlConfig;
 import me.totalfreedom.totalfreedommod.util.FLog;
@ -16,14 +14,13 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;

-//TODO: convert to uuids
 public class ActivityLog extends FreedomService
 {

    public static final String FILENAME = "activitylog.yml";

-    private final Map<UUID, ActivityLogEntry> allActivityLogs = Maps.newHashMap();
-    private final Map<UUID, ActivityLogEntry> activityLogs = Maps.newHashMap();
+    private final Map<String, ActivityLogEntry> allActivityLogs = Maps.newHashMap();
+    private final Map<String, ActivityLogEntry> nameTable = Maps.newHashMap();
    private final Map<String, ActivityLogEntry> ipTable = Maps.newHashMap();

    private final YamlConfig config;
@ -55,7 +52,7 @@ public class ActivityLog extends FreedomService
        config.load();

        allActivityLogs.clear();
-        activityLogs.clear();
+        nameTable.clear();
        ipTable.clear();
        for (String key : config.getKeys(false))
        {
@ -75,7 +72,7 @@ public class ActivityLog extends FreedomService
                continue;
            }

-            allActivityLogs.put(UUID.fromString(key), activityLogEntry);
+            allActivityLogs.put(key, activityLogEntry);
        }

        updateTables();
@ -105,12 +102,12 @@ public class ActivityLog extends FreedomService
            return getActivityLog((Player)sender);
        }

-        return getEntryByUUID(FUtil.getUUIDFromName(sender.getName()));
+        return getEntryByName(sender.getName());
    }

    public ActivityLogEntry getActivityLog(Player player)
    {
-        ActivityLogEntry activityLog = getEntryByUUID(player.getUniqueId());
+        ActivityLogEntry activityLog = getEntryByName(player.getName());
        if (activityLog == null)
        {
            String ip = FUtil.getIp(player);
@ -118,13 +115,14 @@ public class ActivityLog extends FreedomService
            if (activityLog != null)
            {
                // Set the new username
+                activityLog.setName(player.getName());
                save();
                updateTables();
            }
            else
            {
                activityLog = new ActivityLogEntry(player);
-                allActivityLogs.put(activityLog.getUUID(), activityLog);
+                allActivityLogs.put(activityLog.getConfigKey(), activityLog);
                updateTables();

                activityLog.saveTo(config.createSection(activityLog.getConfigKey()));
@ -141,9 +139,9 @@ public class ActivityLog extends FreedomService
        return activityLog;
    }

-    public ActivityLogEntry getEntryByUUID(UUID uuid)
+    public ActivityLogEntry getEntryByName(String name)
    {
-        return activityLogs.get(uuid);
+        return nameTable.get(name.toLowerCase());
    }

    public ActivityLogEntry getEntryByIp(String ip)
@ -153,12 +151,12 @@ public class ActivityLog extends FreedomService

    public void updateTables()
    {
-        activityLogs.clear();
+        nameTable.clear();
        ipTable.clear();

        for (ActivityLogEntry activityLog : allActivityLogs.values())
        {
-            activityLogs.put(activityLog.getUUID(), activityLog);
+            nameTable.put(activityLog.getName().toLowerCase(), activityLog);

            for (String ip : activityLog.getIps())
            {
@ -192,14 +190,14 @@ public class ActivityLog extends FreedomService
        }
    }

-    public Map<UUID, ActivityLogEntry> getAllActivityLogs()
+    public Map<String, ActivityLogEntry> getAllActivityLogs()
    {
        return allActivityLogs;
    }

-    public Map<UUID, ActivityLogEntry> getActivityLogs()
+    public Map<String, ActivityLogEntry> getNameTable()
    {
-        return activityLogs;
+        return nameTable;
    }

    public Map<String, ActivityLogEntry> getIpTable()
--- a/src/main/java/me/totalfreedom/totalfreedommod/admin/ActivityLogEntry.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/ActivityLogEntry.java
@ -4,8 +4,6 @@ import com.google.common.collect.Lists;
 import java.time.Instant;
 import java.util.Date;
 import java.util.List;
-import java.util.UUID;
-
 import me.totalfreedom.totalfreedommod.config.IConfig;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.Validate;
@ -20,20 +18,17 @@ public class ActivityLogEntry implements IConfig
    private final List<String> timestamps = Lists.newArrayList();
    private final List<String> durations = Lists.newArrayList();
    private String configKey;
+    private String name;

    public ActivityLogEntry(Player player)
    {
-        this.configKey = player.getUniqueId().toString();
+        this.configKey = player.getName().toLowerCase();
+        this.name = player.getName();
    }

-    public ActivityLogEntry(UUID uuid)
+    public ActivityLogEntry(String configKey)
    {
-        this.configKey = uuid.toString();
-    }
-
-    public ActivityLogEntry(String uuid)
-    {
-        this.configKey = uuid;
+        this.configKey = configKey;
    }

    public static String getFILENAME()
@ -44,11 +39,13 @@ public class ActivityLogEntry implements IConfig
    public void loadFrom(Player player)
    {
        configKey = player.getName().toLowerCase();
+        name = player.getName();
    }

    @Override
    public void loadFrom(ConfigurationSection cs)
    {
+        name = cs.getString("username", configKey);
        ips.clear();
        ips.addAll(cs.getStringList("ips"));
        timestamps.clear();
@ -60,8 +57,8 @@ public class ActivityLogEntry implements IConfig
    @Override
    public void saveTo(ConfigurationSection cs)
    {
-        Validate.isTrue(isValid(), "Could not save activity entry: " + getUUID() + ". Entry not valid!");
-        cs.set("uuid", getUUID().toString());
+        Validate.isTrue(isValid(), "Could not save activity entry: " + name + ". Entry not valid!");
+        cs.set("username", name);
        cs.set("ips", Lists.newArrayList(ips));
        cs.set("timestamps", Lists.newArrayList(timestamps));
        cs.set("durations", Lists.newArrayList(durations));
@ -76,11 +73,11 @@ public class ActivityLogEntry implements IConfig
    public void addLogout()
    {
        // Fix of Array index out of bonds issue: FS-131
-        String lastLoginString = "";
+        String lastLoginString;
        if(timestamps.size() > 1)
        {
            lastLoginString = timestamps.get(timestamps.size() - 1);
-        } else if (timestamps.size() == 1)
+        }else
        {
            lastLoginString = timestamps.get(0);
        }
@ -139,7 +136,7 @@ public class ActivityLogEntry implements IConfig
    public boolean isValid()
    {
        return configKey != null
-                && getUUID() != null;
+                && name != null;
    }

    public String getConfigKey()
@ -152,6 +149,16 @@ public class ActivityLogEntry implements IConfig
        this.configKey = configKey;
    }

+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
    public List<String> getIps()
    {
        return ips;
@ -166,12 +173,4 @@ public class ActivityLogEntry implements IConfig
    {
        return durations;
    }
-
-    public UUID getUUID() {
-        return UUID.fromString(configKey);
-    }
-
-    public String getName() {
-        return FUtil.getNameFromUUID(getUUID());
-    }
 }
--- a/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java
@ -2,8 +2,11 @@ package me.totalfreedom.totalfreedommod.admin;

 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.*;
-
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import me.totalfreedom.totalfreedommod.LogViewer.LogsRegistrationMode;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.rank.Rank;
@ -18,7 +21,7 @@ public class Admin


    private final List<String> ips = new ArrayList<>();
-    private UUID uuid;
+    private String name;
    private boolean active = true;
    private Rank rank = Rank.ADMIN;
    private Date lastLogin = new Date();
@ -29,7 +32,7 @@ public class Admin

    public Admin(Player player)
    {
-        this.uuid = player.getUniqueId();
+        this.name = player.getName();
        this.ips.add(FUtil.getIp(player));
    }

@ -37,7 +40,7 @@ public class Admin
    {
        try
        {
-            this.uuid = UUID.fromString(resultSet.getString("uuid"));
+            this.name = resultSet.getString("username");
            this.active = resultSet.getBoolean("active");
            this.rank = Rank.findRank(resultSet.getString("rank"));
            this.ips.clear();
@ -59,7 +62,7 @@ public class Admin
    {
        final StringBuilder output = new StringBuilder();

-        output.append("Admin: ").append(uuid.toString()).append("\n")
+        output.append("Admin: ").append(name).append("\n")
                .append("- IPs: ").append(StringUtils.join(ips, ", ")).append("\n")
                .append("- Last Login: ").append(FUtil.dateToString(lastLogin)).append("\n")
                .append("- Rank: ").append(rank.getName()).append("\n")
@ -75,7 +78,7 @@ public class Admin
    {
        Map<String, Object> map = new HashMap<String, Object>()
        {{
-            put("uuid", uuid.toString());
+            put("username", name);
            put("active", active);
            put("rank", rank.toString());
            put("ips", FUtil.listToString(ips));
@ -117,20 +120,20 @@ public class Admin

    public boolean isValid()
    {
-        return uuid != null
+        return name != null
                && rank != null
                && !ips.isEmpty()
                && lastLogin != null;
    }

-    public UUID getUniqueId()
+    public String getName()
    {
-        return uuid;
+        return name;
    }

-    public void setUniqueId(UUID uuid)
+    public void setName(String name)
    {
-        this.uuid = uuid;
+        this.name = name;
    }

    public boolean isActive()
@ -165,7 +168,6 @@ public class Admin
        }
    }

-
    public Rank getRank()
    {
        return rank;
@ -230,9 +232,4 @@ public class Admin
    {
        this.pteroID = pteroID;
    }
-
-    public String getName()
-    {
-        return FUtil.getNameFromUUID(uuid);
-    }
 }
--- a/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java
@ -4,7 +4,11 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
@ -22,7 +26,7 @@ public class AdminList extends FreedomService
    private final Set<Admin> allAdmins = Sets.newHashSet(); // Includes disabled admins
    // Only active admins below
    private final Set<Admin> activeAdmins = Sets.newHashSet();
-    private final Map<UUID, Admin> adminTable = Maps.newHashMap();
+    private final Map<String, Admin> nameTable = Maps.newHashMap();
    private final Map<String, Admin> ipTable = Maps.newHashMap();

    public static List<String> getVanished()
@ -62,7 +66,7 @@ public class AdminList extends FreedomService
        }

        updateTables();
-        FLog.info("Loaded " + allAdmins.size() + " admins (" + adminTable.size() + " active,  " + ipTable.size() + " IPs)");
+        FLog.info("Loaded " + allAdmins.size() + " admins (" + nameTable.size() + " active,  " + ipTable.size() + " IPs)");
    }

    public void messageAllAdmins(String message)
@ -93,16 +97,14 @@ public class AdminList extends FreedomService
        return isAdmin(sender);
    }

-    @Deprecated
    public List<String> getActiveAdminNames()
    {
-        /*List<String> names = new ArrayList();
+        List<String> names = new ArrayList();
        for (Admin admin : activeAdmins)
        {
            names.add(admin.getName());
        }
-        return names;*/
-        throw new UnsupportedOperationException("Admin no longer stores names in the object, may be changed in a future update");
+        return names;
    }

    public boolean isAdmin(CommandSender sender)
@ -140,21 +142,21 @@ public class AdminList extends FreedomService
        return admin.getRank().ordinal() >= Rank.SENIOR_ADMIN.ordinal();
    }

-    public Admin getAdmin(CommandSender sender) //TODO: Fix
+    public Admin getAdmin(CommandSender sender)
    {
        if (sender instanceof Player)
        {
            return getAdmin((Player)sender);
        }

-        return getEntryByUUID(FUtil.getUUIDFromName(sender.getName()));
+        return getEntryByName(sender.getName());
    }

    public Admin getAdmin(Player player)
    {
        // Find admin
        String ip = FUtil.getIp(player);
-        Admin admin = getEntryByUUID(player.getUniqueId());
+        Admin admin = getEntryByName(player.getName());

        // Admin by name
        if (admin != null)
@ -179,16 +181,18 @@ public class AdminList extends FreedomService
        if (admin != null)
        {
            // Set the new username
-            //plugin.sql.updateAdminName(oldName, admin.getName());
+            String oldName = admin.getName();
+            admin.setName(player.getName());
+            plugin.sql.updateAdminName(oldName, admin.getName());
            updateTables();
        }

        return null;
    }

-    public Admin getEntryByUUID(UUID uuid)
+    public Admin getEntryByName(String name)
    {
-        return adminTable.get(uuid);
+        return nameTable.get(name.toLowerCase());
    }

    public Admin getEntryByIp(String ip)
@ -196,7 +200,6 @@ public class AdminList extends FreedomService
        return ipTable.get(ip);
    }

-    @Deprecated // TODO: no ips maybe ? idk soontm
    public Admin getEntryByIpFuzzy(String needleIp)
    {
        final Admin directAdmin = getEntryByIp(needleIp);
@ -225,12 +228,13 @@ public class AdminList extends FreedomService
        }

        admin.setLastLogin(new Date());
+        admin.setName(player.getName());
        save(admin);
    }

    public boolean isAdminImpostor(Player player)
    {
-        return getEntryByUUID(player.getUniqueId()) != null && !isAdmin(player) && !isVerifiedAdmin(player);
+        return getEntryByName(player.getName()) != null && !isAdmin(player) && !isVerifiedAdmin(player);
    }

    public boolean isVerifiedAdmin(Player player)
@ -293,7 +297,7 @@ public class AdminList extends FreedomService
    public void updateTables()
    {
        activeAdmins.clear();
-        adminTable.clear();
+        nameTable.clear();
        ipTable.clear();

        for (Admin admin : allAdmins)
@ -304,7 +308,7 @@ public class AdminList extends FreedomService
            }

            activeAdmins.add(admin);
-            adminTable.put(admin.getUniqueId(), admin);
+            nameTable.put(admin.getName().toLowerCase(), admin);

            for (String ip : admin.getIps())
            {
@ -314,9 +318,9 @@ public class AdminList extends FreedomService
        }
    }

-    public Set<UUID> getAdminUUIDs()
+    public Set<String> getAdminNames()
    {
-        return adminTable.keySet();
+        return nameTable.keySet();
    }

    public Set<String> getAdminIps()
@ -328,7 +332,7 @@ public class AdminList extends FreedomService
    {
        try
        {
-            ResultSet currentSave = plugin.sql.getAdminByUUID(admin.getUniqueId());
+            ResultSet currentSave = plugin.sql.getAdminByName(admin.getName());
            for (Map.Entry<String, Object> entry : admin.toSQLStorable().entrySet())
            {
                Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue());
@ -388,6 +392,11 @@ public class AdminList extends FreedomService
        return activeAdmins;
    }

+    public Map<String, Admin> getNameTable()
+    {
+        return nameTable;
+    }
+
    public Map<String, Admin> getIpTable()
    {
        return ipTable;
--- a/src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java
@ -19,8 +19,6 @@ import org.bukkit.entity.Player;
 public class Ban
 {

-    //TODO: fuck your usernames and getting by ips, bans will be in uuid maybe soon tm idk
-
    public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd 'at' HH:mm:ss z");
    private final List<String> ips = Lists.newArrayList();
    private String username = null;
--- a/src/main/java/me/totalfreedom/totalfreedommod/banning/IndefiniteBan.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/banning/IndefiniteBan.java
@ -43,7 +43,6 @@ public class IndefiniteBan implements IConfig
    @Override
    public void saveTo(ConfigurationSection cs)
    {
-        // The indefinite ban list is only intended to be modified manually. It is not intended to save.
    }

    @Override
--- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java
@ -171,11 +171,6 @@ public class BlockBlocker extends FreedomService
                }
                break;
            }
-            default:
-            {
-                // Do nothing
-                break;
-            }
        }

        if (Groups.BANNERS.contains(event.getBlockPlaced().getType()))
--- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java
@ -36,9 +36,10 @@ public class InteractBlocker extends FreedomService
                break;
            }

-            default:
+            case LEFT_CLICK_AIR:
+            case LEFT_CLICK_BLOCK:
            {
-                // Do nothing
+                //
                break;
            }
        }
@ -157,11 +158,6 @@ public class InteractBlocker extends FreedomService
                event.setCancelled(true);
                break;
            }
-            default:
-            {
-                // Do nothing
-                break;
-            }
        }
    }
 }
--- a/src/main/java/me/totalfreedom/totalfreedommod/bridge/BukkitTelnetBridge.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/bridge/BukkitTelnetBridge.java
@ -12,7 +12,6 @@ import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FLog;
-import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@ -127,7 +126,7 @@ public class BukkitTelnetBridge extends FreedomService
        {
            for (ClientSession session : telnet.appender.getSessions())
            {
-                Admin admin = plugin.al.getEntryByUUID(FUtil.getUUIDFromName(session.getUserName()));
+                Admin admin = plugin.al.getEntryByName(session.getUserName().toLowerCase());
                if (admin != null && !admins.contains(admin))
                {
                    admins.add(admin);
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ban.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ban.java
@ -65,7 +65,7 @@ public class Command_ban extends FreedomCommand
        final Player player = getPlayer(args[0]);
        if (player == null)
        {
-            final PlayerData entry = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
+            final PlayerData entry = plugin.pl.getData(args[0]);

            if (entry == null)
            {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockcmd.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockcmd.java
@ -1,8 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;

 import me.totalfreedom.totalfreedommod.player.FPlayer;
-import me.totalfreedom.totalfreedommod.punishments.Punishment;
-import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
@ -77,11 +75,9 @@ public class Command_blockcmd extends FreedomCommand
        FPlayer playerdata = plugin.pl.getPlayer(player);
        if (!playerdata.allCommandsBlocked())
        {
-            FUtil.adminAction(sender.getName(), "Blocking all commands for " + player.getName(), true);
            playerdata.setCommandsBlocked(true);
+            FUtil.adminAction(sender.getName(), "Blocking all commands for " + player.getName(), true);
            msg("Blocked commands for " + player.getName() + ".");
-
-            plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player), sender.getName(), PunishmentType.BLOCKCMD, null));
        }
        else
        {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockedit.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockedit.java
@ -1,8 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;

 import me.totalfreedom.totalfreedommod.player.FPlayer;
-import me.totalfreedom.totalfreedommod.punishments.Punishment;
-import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.ArrayUtils;
@ -130,8 +128,6 @@ public class Command_blockedit extends FreedomCommand

            msg(player2, "Your block modification abilities have been blocked.", ChatColor.RED);
            msg("Blocked all block modification abilities for " + player2.getName());
-
-            plugin.pul.logPunishment(new Punishment(player2.getName(), FUtil.getIp(player2), sender.getName(), PunishmentType.BLOCKEDIT, null));
        }
        return true;
    }
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockpvp.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockpvp.java
@ -1,8 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;

 import me.totalfreedom.totalfreedommod.player.FPlayer;
-import me.totalfreedom.totalfreedommod.punishments.Punishment;
-import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang3.ArrayUtils;
@ -127,7 +125,6 @@ public class Command_blockpvp extends FreedomCommand
            {
                Command_smite.smite(sender, p, reason);
            }
-            plugin.pul.logPunishment(new Punishment(p.getName(), FUtil.getIp(p), sender.getName(), PunishmentType.BLOCKPVP, null));

            msg(p, "Your PVP has been disabled.", ChatColor.RED);
            msg("Disabled PVP for " + p.getName());
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java
@ -5,8 +5,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
-import me.totalfreedom.totalfreedommod.punishments.Punishment;
-import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
@ -77,43 +75,17 @@ public class Command_cage extends FreedomCommand
                }
                case "block":
                {
-                    if (args.length >= 3)
+                    if (Material.matchMaterial(args[2]) != null)
                    {
-                        // Checks the validity of the Material and checks if it's a block.
-                        // This is incredibly inefficient, as Spigot's isBlock() method in Material is an actual
-                        // nightmare of switch-cases.
-                        if (Material.matchMaterial(args[2]) != null && Material.matchMaterial(args[2]).isBlock())
-                        {
-                            outerMaterial = Material.matchMaterial(args[2]);
-                            break;
-                        }
-                        else
-                        {
-                            msg("Invalid block!", ChatColor.RED);
-                            return true;
-                        }
+                        outerMaterial = Material.matchMaterial(args[2]);
+                        break;
                    }
-                    else
-                    {
-                        return false;
-                    }
-                }
-                default:
-                {
-                    return false;
+                    msg("Invalid block!", ChatColor.RED);
+                    break;
                }
            }
        }

-        if (outerMaterial == Material.PLAYER_HEAD)
-        {
-            FUtil.adminAction(sender.getName(), "Caging " + player.getName() + " in " + skullName, true);
-        }
-        else
-        {
-            FUtil.adminAction(sender.getName(), "Caging " + player.getName(), true);
-        }
-
        Location location = player.getLocation().clone().add(0.0, 1.0, 0.0);

        if (skullName != null)
@ -124,9 +96,17 @@ public class Command_cage extends FreedomCommand
        {
            fPlayer.getCageData().cage(location, outerMaterial, innerMaterial);
        }
+
        player.setGameMode(GameMode.SURVIVAL);

-        plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player), sender.getName(), PunishmentType.CAGE, null));
+        if (outerMaterial == Material.PLAYER_HEAD)
+        {
+            FUtil.adminAction(sender.getName(), "Caging " + player.getName() + " in " + skullName, true);
+        }
+        else
+        {
+            FUtil.adminAction(sender.getName(), "Caging " + player.getName(), true);
+        }
        return true;
    }

--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearchat.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clearchat.java
@ -8,7 +8,7 @@ import org.bukkit.entity.Player;

@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Clears the chat.", usage = "/<command>", aliases = "cc")
-public class Command_cleanchat extends FreedomCommand
+public class Command_clearchat extends FreedomCommand
 {

    @Override
@ -27,4 +27,4 @@ public class Command_cleanchat extends FreedomCommand
        FUtil.adminAction(sender.getName(), "Cleared chat", true);
        return true;
    }
-}
+}
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_doom.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_doom.java
@ -56,7 +56,7 @@ public class Command_doom extends FreedomCommand
            plugin.ptero.updateAccountStatus(admin);
            if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean())
            {
-                Discord.syncRoles(admin, plugin.pl.getData(admin.getUniqueId()).getDiscordID());
+                Discord.syncRoles(admin, plugin.pl.getData(admin.getName()).getDiscordID());
            }
        }

--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_entitywipe.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_entitywipe.java
@ -64,12 +64,6 @@ public class Command_entitywipe extends FreedomCommand
                    return true;
                }

-                if (type == EntityType.PLAYER)
-                {
-                    msg("Player entities cannot be purged.", ChatColor.RED);
-                    return true;
-                }
-
                if (!getAllEntities().contains(type))
                {
                    msg(FUtil.formatName(type.name()) + " is an entity, however: it is a mob.", ChatColor.RED);
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_freeze.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_freeze.java
@ -23,12 +23,12 @@ public class Command_freeze extends FreedomCommand

            if (!gFreeze)
            {
-                FUtil.adminAction(sender.getName(), "Unfreezing all players", false);
+                FUtil.adminAction(sender.getName(), "Disabling global player freeze", false);
                msg("Players are now free to move.");
                return true;
            }

-            FUtil.adminAction(sender.getName(), "Freezing all players", false);
+            FUtil.adminAction(sender.getName(), "Enabling global player freeze", false);
            for (Player player : server.getOnlinePlayers())
            {
                if (!isAdmin(player))
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_linkdiscord.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_linkdiscord.java
@ -3,7 +3,6 @@ package me.totalfreedom.totalfreedommod.command;
 import me.totalfreedom.totalfreedommod.discord.Discord;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@ -25,7 +24,7 @@ public class Command_linkdiscord extends FreedomCommand

        if (args.length > 1 && plugin.al.isAdmin(playerSender))
        {
-            PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
+            PlayerData playerData = plugin.pl.getData(args[0]);
            if (playerData == null)
            {
                msg(PLAYER_NOT_FOUND);
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_manageshop.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_manageshop.java
@ -35,14 +35,14 @@ public class Command_manageshop extends FreedomCommand
            }
            switch (args[1])
            {
+
                case "add":
-                {
                    try
                    {
                        int amount = Math.max(0, Math.min(1000000, Integer.parseInt(args[2])));
                        if (!args[3].equals("all"))
                        {
-                            PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[3]));
+                            PlayerData playerData = plugin.pl.getData(args[3]);
                            if (playerData == null)
                            {
                                msg(PLAYER_NOT_FOUND);
@ -75,15 +75,13 @@ public class Command_manageshop extends FreedomCommand
                        msg("Invalid number: " + args[2], ChatColor.RED);
                        return true;
                    }
-                }
                case "remove":
-                {
                    try
                    {
                        int amount = Math.max(0, Math.min(1000000, Integer.parseInt(args[2])));
                        if (!args[3].equals("all"))
                        {
-                            PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[3]));
+                            PlayerData playerData = plugin.pl.getData(args[3]);
                            if (playerData == null)
                            {
                                msg(PLAYER_NOT_FOUND);
@ -124,13 +122,11 @@ public class Command_manageshop extends FreedomCommand
                        msg("Invalid number: " + args[2], ChatColor.RED);
                        return true;
                    }
-                }
                case "set":
-                {
                    try
                    {
                        int amount = Math.max(0, Math.min(1000000, Integer.parseInt(args[2])));
-                        PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[3]));
+                        PlayerData playerData = plugin.pl.getData(args[3]);
                        if (playerData == null)
                        {
                            msg(PLAYER_NOT_FOUND);
@ -151,11 +147,6 @@ public class Command_manageshop extends FreedomCommand
                        msg("Invalid number: " + args[2], ChatColor.RED);
                        return true;
                    }
-                }
-                default:
-                {
-                    return false;
-                }
            }
        }
        else if (args[0].equals("items"))
@ -180,7 +171,7 @@ public class Command_manageshop extends FreedomCommand
                    return true;
                }

-                PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[3]));
+                PlayerData playerData = plugin.pl.getData(args[3]);
                if (playerData == null)
                {
                    msg(PLAYER_NOT_FOUND);
@ -205,7 +196,7 @@ public class Command_manageshop extends FreedomCommand
                    return true;
                }

-                PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[3]));
+                PlayerData playerData = plugin.pl.getData(args[3]);
                if (playerData == null)
                {
                    msg(PLAYER_NOT_FOUND);
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java
@ -45,7 +45,7 @@ public class Command_mbconfig extends FreedomCommand
                    return true;
                }

-                PlayerData data = plugin.pl.getData(FUtil.getUUIDFromName(sender.getName()));
+                PlayerData data = plugin.pl.getData(sender.getName());
                if (!data.isMasterBuilder())
                {
                    msg("You are not a master builder!", ChatColor.RED);
@ -74,7 +74,7 @@ public class Command_mbconfig extends FreedomCommand
                    return true;
                }

-                PlayerData data = plugin.pl.getData(FUtil.getUUIDFromName(sender.getName()));
+                PlayerData data = plugin.pl.getData(sender.getName());
                final String targetIp = FUtil.getIp(playerSender);

                if (!data.isMasterBuilder())
@ -101,14 +101,14 @@ public class Command_mbconfig extends FreedomCommand
                    return false;
                }

-                if (plugin.pl.canManageMasterBuilders(FUtil.getUUIDFromName(sender.getName())))
+                if (plugin.pl.canManageMasterBuilders(sender.getName()))
                {
                    return noPerms();
                }

                final Player player = getPlayer(args[1]);

-                PlayerData data = player != null ? plugin.pl.getData(player) : plugin.pl.getData(FUtil.getUUIDFromName(args[1]));
+                PlayerData data = player != null ? plugin.pl.getData(player) : plugin.pl.getData(args[1]);

                if (data == null)
                {
@ -157,13 +157,13 @@ public class Command_mbconfig extends FreedomCommand
                    return false;
                }

-                if (plugin.pl.canManageMasterBuilders(FUtil.getUUIDFromName(sender.getName())))
+                if (plugin.pl.canManageMasterBuilders(sender.getName()))
                {
                    return noPerms();
                }

                Player player = getPlayer(args[1]);
-                PlayerData data = player != null ? plugin.pl.getData(player) : plugin.pl.getData(FUtil.getUUIDFromName(args[1]));
+                PlayerData data = player != null ? plugin.pl.getData(player) : plugin.pl.getData(args[1]);

                if (data == null || !data.isMasterBuilder())
                {
@ -210,7 +210,7 @@ public class Command_mbconfig extends FreedomCommand
            }
            else if (args[0].equalsIgnoreCase("clearip"))
            {
-                PlayerData data = plugin.pl.getData(FUtil.getUUIDFromName(sender.getName()));
+                PlayerData data = plugin.pl.getData(sender.getName());
                if (data.isMasterBuilder())
                {
                    return data.getIps();
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java
@ -170,7 +170,7 @@ public class Command_myadmin extends FreedomCommand
                        msg("Role syncing is not enabled.", ChatColor.RED);
                        return true;
                    }
-                    PlayerData playerData = plugin.pl.getData(target.getUniqueId());
+                    PlayerData playerData = plugin.pl.getData(target.getName());
                    if (playerData.getDiscordID() == null)
                    {
                        msg("Please run /linkdiscord first!", ChatColor.RED);
@ -248,7 +248,7 @@ public class Command_myadmin extends FreedomCommand
        {
            if (args[0].equals("-o") && args[2].equals("clearip"))
            {
-                Admin admin = plugin.al.getEntryByUUID(FUtil.getUUIDFromName(args[1]));
+                Admin admin = plugin.al.getEntryByName(args[1]);
                if (admin != null)
                {
                    return admin.getIps();
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_notes.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_notes.java
@ -31,7 +31,7 @@ public class Command_notes extends FreedomCommand
        final Player player = getPlayer(args[0]);
        if (player == null)
        {
-            final PlayerData entry = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
+            final PlayerData entry = plugin.pl.getData(args[0]);

            if (entry == null)
            {
@ -39,7 +39,7 @@ public class Command_notes extends FreedomCommand
                return true;
            }

-            playerData = entry;
+            playerData = plugin.pl.getData(entry.getName());
        }
        else
        {
@ -116,12 +116,8 @@ public class Command_notes extends FreedomCommand
                msg("Cleared " + count + " notes.", ChatColor.GREEN);
                return true;
            }
-
-            default:
-            {
-                return false;
-            }
        }
+        return false;
    }

    @Override
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_orbit.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_orbit.java
@ -1,8 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;

 import me.totalfreedom.totalfreedommod.player.FPlayer;
-import me.totalfreedom.totalfreedommod.punishments.Punishment;
-import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
@ -58,13 +56,11 @@ public class Command_orbit extends FreedomCommand
            }
        }

-        FUtil.adminAction(sender.getName(), "Orbiting " + player.getName(), false);
-
        player.setGameMode(GameMode.SURVIVAL);
        playerdata.startOrbiting(strength);
-        player.setVelocity(new Vector(0, strength, 0));

-        plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player), sender.getName(), PunishmentType.ORBIT, null));
+        player.setVelocity(new Vector(0, strength, 0));
+        FUtil.adminAction(sender.getName(), "Orbiting " + player.getName(), false);
        return true;
    }
 }
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potion.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potion.java
@ -29,7 +29,6 @@ public class Command_potion extends FreedomCommand
        switch (args.length)
        {
            case 1:
-            {
                if (args[0].equalsIgnoreCase("list"))
                {
                    List<String> potionEffectTypeNames = new ArrayList<>();
@ -59,10 +58,8 @@ public class Command_potion extends FreedomCommand
                        }
                    }
                }
-            }

            case 2:
-            {
                if (args[0].equalsIgnoreCase("clear"))
                {
                    Player target = playerSender;
@ -98,11 +95,9 @@ public class Command_potion extends FreedomCommand
                    msg("Cleared all active potion effects " + (!target.equals(playerSender) ? "from player " + target.getName() + "." : "from yourself."), ChatColor.AQUA);
                }
                break;
-            }

            case 4:
            case 5:
-            {
                if (args[0].equalsIgnoreCase("add"))
                {
                    Player target = playerSender;
@ -172,11 +167,8 @@ public class Command_potion extends FreedomCommand
                                    + (!target.equals(playerSender) ? " to player " + target.getName() + "." : " to yourself."), ChatColor.AQUA);
                }
                break;
-            }
            default:
-            {
                return false;
-            }
        }
        return true;
    }
@ -187,17 +179,14 @@ public class Command_potion extends FreedomCommand
        switch (args.length)
        {
            case 1:
-            {
                List<String> arguments = new ArrayList<>(Arrays.asList("list", "clear", "add"));
                if (plugin.al.isAdmin(sender))
                {
                    arguments.add("clearall");
                }
                return arguments;
-            }

            case 2:
-            {
                if (args[0].equals("clear"))
                {
                    if (plugin.al.isAdmin(sender))
@ -210,28 +199,22 @@ public class Command_potion extends FreedomCommand
                    return getAllPotionTypes();
                }
                break;
-            }

            case 3:
-            {
                if (args[0].equals("add"))
                {
                    return Collections.singletonList("<duration>");
                }
                break;
-            }

            case 4:
-            {
                if (args[0].equals("add"))
                {
                    return Collections.singletonList("<amplifier>");
                }
                break;
-            }

            case 5:
-            {
                if (plugin.al.isAdmin(sender))
                {
                    if (args[0].equals("add"))
@ -240,12 +223,6 @@ public class Command_potion extends FreedomCommand
                    }
                }
                break;
-            }
-
-            default:
-            {
-                break;
-            }
        }

        return Collections.emptyList();
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java
@ -5,8 +5,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
-
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.discord.Discord;
@ -36,7 +34,7 @@ public class Command_saconfig extends FreedomCommand
        {
            case "list":
            {
-                msg("Admins: " + StringUtils.join(plugin.al.getAdminUUIDs().stream().map(FUtil::getNameFromUUID).collect(Collectors.toList()), ", "), ChatColor.GOLD);
+                msg("Admins: " + StringUtils.join(plugin.al.getAdminNames(), ", "), ChatColor.GOLD);
                return true;
            }

@ -47,7 +45,7 @@ public class Command_saconfig extends FreedomCommand

                FUtil.adminAction(sender.getName(), "Cleaning the admin list", true);
                plugin.al.deactivateOldEntries(true);
-                msg("Admins: " + StringUtils.join(plugin.al.getAdminUUIDs().stream().map(FUtil::getNameFromUUID).collect(Collectors.toList()), ", "), ChatColor.GOLD);
+                msg("Admins: " + StringUtils.join(plugin.al.getAdminNames(), ", "), ChatColor.GOLD);

                return true;
            }
@ -91,7 +89,7 @@ public class Command_saconfig extends FreedomCommand
                    return true;
                }

-                Admin admin = plugin.al.getEntryByUUID(FUtil.getUUIDFromName(args[1]));
+                Admin admin = plugin.al.getEntryByName(args[1]);
                if (admin == null)
                {
                    msg("Unknown admin: " + args[1]);
@ -111,7 +109,7 @@ public class Command_saconfig extends FreedomCommand

                if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean())
                {
-                    Discord.syncRoles(admin, plugin.pl.getData(admin.getUniqueId()).getDiscordID());
+                    Discord.syncRoles(admin, plugin.pl.getData(admin.getName()).getDiscordID());
                }

                plugin.ptero.updateAccountStatus(admin);
@ -129,7 +127,7 @@ public class Command_saconfig extends FreedomCommand

                checkRank(Rank.ADMIN);

-                Admin admin = plugin.al.getEntryByUUID(FUtil.getUUIDFromName(args[1]));
+                Admin admin = plugin.al.getEntryByName(args[1]);

                if (admin == null)
                {
@ -208,12 +206,12 @@ public class Command_saconfig extends FreedomCommand
                {
                    FUtil.adminAction(sender.getName(), "Re-adding " + player.getName() + " to the admin list", true);

-                    /*String oldName = admin.getName();
+                    String oldName = admin.getName();
                    if (!oldName.equals(player.getName()))
                    {
                        admin.setName(player.getName());
                        plugin.sql.updateAdminName(oldName, admin.getName());
-                    }*/
+                    }
                    admin.addIp(FUtil.getIp(player));

                    admin.setActive(true);
@ -261,7 +259,7 @@ public class Command_saconfig extends FreedomCommand
                checkRank(Rank.ADMIN);

                Player player = getPlayer(args[1]);
-                Admin admin = player != null ? plugin.al.getAdmin(player) : plugin.al.getEntryByUUID(FUtil.getUUIDFromName(args[1]));
+                Admin admin = player != null ? plugin.al.getAdmin(player) : plugin.al.getEntryByName(args[1]);

                if (admin == null)
                {
@ -282,7 +280,7 @@ public class Command_saconfig extends FreedomCommand

                if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean())
                {
-                    Discord.syncRoles(admin, plugin.pl.getData(admin.getUniqueId()).getDiscordID());
+                    Discord.syncRoles(admin, plugin.pl.getData(admin.getName()).getDiscordID());
                }

                plugin.ptero.updateAccountStatus(admin);
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_seed.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_seed.java
@ -1,97 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.api.chat.ClickEvent;
-import net.md_5.bungee.api.chat.HoverEvent;
-import net.md_5.bungee.api.chat.TextComponent;
-import net.md_5.bungee.api.chat.TranslatableComponent;
-import net.md_5.bungee.api.chat.hover.content.Text;
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@CommandPermissions(level = Rank.NON_OP, source = SourceType.BOTH)
-@CommandParameters(description = "Get the seed of the world you are currently in.", usage = "/seed [world]")
-public class Command_seed extends FreedomCommand
-{
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        World world;
-
-        if (args.length > 0)
-        {
-            world = server.getWorld(args[0]);
-            if (world == null)
-            {
-                msg("That world could not be found", ChatColor.RED);
-                return true;
-            }
-        }
-        else
-        {
-            // If the sender is a Player, use that world. Otherwise, use the overworld as a fallback.
-            if (!senderIsConsole)
-            {
-                world = playerSender.getWorld();
-            }
-            else
-            {
-                world = server.getWorlds().get(0);
-            }
-        }
-
-        // If the sender is not a Player, use the usual msg method to
-        if (senderIsConsole)
-        {
-            msg("Seed: [" + ChatColor.GREEN + world.getSeed() + ChatColor.WHITE + "]", ChatColor.WHITE);
-        }
-        else
-        {
-            // Gets the seed for later uses
-            String seed = String.valueOf(world.getSeed());
-
-            // This is a really stupid hack to get things to play nicely, but it works so I don't give a damn
-            BaseComponent[] components = {new TranslatableComponent("chat.copy.click")};
-            TextComponent seedAsComponent = new TextComponent(seed);
-
-            // Style the message like in vanilla Minecraft.
-            seedAsComponent.setColor(ChatColor.GREEN.asBungee());
-            seedAsComponent.setClickEvent(new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, seed));
-            seedAsComponent.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(components)));
-
-            // Enclose the seed with brackets
-            TextComponent seedString = new TextComponent("[");
-            seedString.addExtra(seedAsComponent);
-            seedString.addExtra("]");
-
-            // Send the message to the player.
-            TranslatableComponent response = new TranslatableComponent("commands.seed.success", seedString);
-            playerSender.spigot().sendMessage(response);
-        }
-        return true;
-    }
-
-    @Override
-    public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
-    {
-        if (args.length == 1)
-        {
-            // Returns a list of worlds on the server and returns it
-            List<String> worlds = new ArrayList<>();
-            for (World world : server.getWorlds())
-            {
-                worlds.add(world.getName());
-            }
-            return worlds;
-        }
-
-        return null;
-    }
-}
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_settotalvotes.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_settotalvotes.java
@ -3,7 +3,6 @@ package me.totalfreedom.totalfreedommod.command;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@ -39,7 +38,7 @@ public class Command_settotalvotes extends FreedomCommand
            return true;
        }

-        PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[1]));
+        PlayerData playerData = plugin.pl.getData(args[1]);

        if (playerData == null)
        {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java
@ -105,11 +105,6 @@ public class Command_tag extends FreedomCommand
                    }
                    return true;
                }
-
-                default:
-                {
-                    return false;
-                }
            }
        }
        else if (args.length >= 2)
@ -284,11 +279,6 @@ public class Command_tag extends FreedomCommand
                    msg("Tag set to '" + outputTag + ChatColor.GRAY + "'." + (save ? " (Saved)" : "") + from + to);
                    return true;
                }
-
-                default:
-                {
-                    return false;
-                }
            }
        }
        return false;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tban.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tban.java
@ -46,7 +46,7 @@ public class Command_tban extends FreedomCommand
        final PlayerData entry;
        if (player == null)
        {
-            entry = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
+            entry = plugin.pl.getData(args[0]);

            if (entry == null)
            {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tempban.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tempban.java
@ -53,7 +53,7 @@ public class Command_tempban extends FreedomCommand
        final PlayerData entry;
        if (player == null)
        {
-            entry = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
+            entry = plugin.pl.getData(args[0]);

            if (entry == null)
            {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_toggle.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_toggle.java
@ -16,12 +16,6 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Toggles TotalFreedomMod settings", usage = "/<command> [option] [value] [value]")
 public class Command_toggle extends FreedomCommand
 {
-    private final List<String> toggles = Arrays.asList(
-            "waterplace", "fireplace", "lavaplace", "fluidspread", "lavadmg", "firespread", "frostwalk",
-            "firework", "prelog", "lockdown", "petprotect", "entitywipe", "nonuke [range] [count]",
-            "explosives [radius]", "unsafeenchs", "bells", "armorstands", "structureblocks", "jigsaws", "grindstones",
-            "jukeboxes", "spawners", "4chan", "beehives", "respawnanchors", "autotp", "autoclear", "minecarts", "mp44",
-            "landmines", "tossmob", "gravity");

    @Override
    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
@ -29,10 +23,38 @@ public class Command_toggle extends FreedomCommand
        if (args.length == 0)
        {
            msg("Available toggles: ");
-            for (String toggle : toggles)
-            {
-                msg("- " + toggle);
-            }
+            msg("- waterplace");
+            msg("- fireplace");
+            msg("- lavaplace");
+            msg("- fluidspread");
+            msg("- lavadmg");
+            msg("- firespread");
+            msg("- frostwalk");
+            msg("- firework");
+            msg("- prelog");
+            msg("- lockdown");
+            msg("- petprotect");
+            msg("- entitywipe");
+            msg("- nonuke [range] [count]");
+            msg("- explosives [radius]");
+            msg("- unsafeenchs");
+            msg("- bells");
+            msg("- armorstands");
+            msg("- structureblocks");
+            msg("- jigsaws");
+            msg("- grindstones");
+            msg("- jukeboxes");
+            msg("- spawners");
+            msg("- 4chan");
+            msg("- beehives");
+            msg("- respawnanchors");
+            msg("- autotp");
+            msg("- autoclear");
+            msg("- minecarts");
+            msg("- landmines");
+            msg("- mp44");
+            msg("- tossmob");
+            msg("- gravity");
            return false;
        }

@ -282,16 +304,6 @@ public class Command_toggle extends FreedomCommand
                toggle("Block gravity is", ConfigEntry.ALLOW_GRAVITY);
                break;
            }
-
-            default:
-            {
-                msg("Available toggles: ");
-                for (String toggle : toggles)
-                {
-                    msg("- " + toggle);
-                }
-                return false;
-            }
        }
        return true;
    }
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unban.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unban.java
@ -22,7 +22,7 @@ public class Command_unban extends FreedomCommand
        if (args.length > 0)
        {
            String username;
-            final PlayerData entry = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
+            final PlayerData entry = plugin.pl.getData(args[0]);

            if (entry == null)
            {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkdiscord.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkdiscord.java
@ -2,7 +2,6 @@ package me.totalfreedom.totalfreedommod.command;

 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@ -24,7 +23,7 @@ public class Command_unlinkdiscord extends FreedomCommand

        if (args.length != 0 && plugin.al.isAdmin(playerSender))
        {
-            PlayerData playerData = plugin.pl.getData(FUtil.getUUIDFromName(args[0]));
+            PlayerData playerData = plugin.pl.getData(args[0]);
            if (playerData == null)
            {
                msg(PLAYER_NOT_FOUND);
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_warn.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_warn.java
@ -1,9 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;

-import me.totalfreedom.totalfreedommod.punishments.Punishment;
-import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
@ -56,28 +53,25 @@ public class Command_warn extends FreedomCommand

        String warnReason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
        player.sendTitle(ChatColor.RED + "You've been warned.", ChatColor.YELLOW + "Reason: " + warnReason, 20, 100, 60);
-        msg(player, ChatColor.RED + "[WARNING] You received a warning from " + sender.getName() + ": " + warnReason);
-        plugin.pl.getPlayer(player).incrementWarnings(quiet);
-        plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player), sender.getName(), PunishmentType.WARN, warnReason));
+        msg(ChatColor.GREEN + "You have successfully warned " + player.getName());

        if (quiet)
        {
-            msg("You have successfully warned " + player.getName() + " quietly.");
+            msg("Warned " + player.getName() + " quietly");
+            return true;
        }
-        else
-        {
-            String adminNotice = ChatColor.RED +
-                    sender.getName() +
-                    " - " +
-                    "Warning: " +
-                    player.getName() +
-                    " - Reason: " +
-                    ChatColor.YELLOW +
-                    warnReason;
-            plugin.al.messageAllAdmins(adminNotice);

-            msg("You have successfully warned " + player.getName() + ".");
-        }
+        msg(player, ChatColor.RED + "[WARNING] You received a warning from " + sender.getName() + ": " + warnReason);
+        String adminNotice = ChatColor.RED +
+                sender.getName() +
+                " - " +
+                "Warning: " +
+                player.getName() +
+                " - Reason: " +
+                ChatColor.YELLOW +
+                warnReason;
+        plugin.al.messageAllAdmins(adminNotice);
+        plugin.pl.getPlayer(player).incrementWarnings();
        return true;
    }
 }
--- a/src/main/java/me/totalfreedom/totalfreedommod/discord/PrivateMessageListener.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/discord/PrivateMessageListener.java
@ -24,7 +24,7 @@ public class PrivateMessageListener extends ListenerAdapter
                    player.setDiscordID(event.getMessage().getAuthor().getId());
                    player.setVerification(true);

-                    Admin admin = TotalFreedomMod.getPlugin().al.getEntryByUUID(player.getUniqueId());
+                    Admin admin = TotalFreedomMod.getPlugin().al.getEntryByName(name);
                    if (admin != null)
                    {
                        Discord.syncRoles(admin, player.getDiscordID());
--- a/src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java
@ -128,7 +128,7 @@ public class ItemFun extends FreedomService

            LivingEntity livingEntity = (LivingEntity)event.getRightClicked();
            EntityType entityType = livingEntity.getType();
-            if (entityType != fPlayer.mobThrowerCreature())
+            if (!(entityType == fPlayer.mobThrowerCreature()))
            {
                return;
            }
@ -304,11 +304,6 @@ public class ItemFun extends FreedomService
                }
                break;
            }
-            default:
-            {
-                // Do nothing
-                break;
-            }
        }
    }

--- a/src/main/java/me/totalfreedom/totalfreedommod/fun/Landminer.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/fun/Landminer.java
@ -73,7 +73,7 @@ public class Landminer extends FreedomService
                continue;
            }

-            if (player.getLocation().distanceSquared(location) > (landmine.radius * landmine.radius))
+            if (!(player.getLocation().distanceSquared(location) <= (landmine.radius * landmine.radius)))
            {
                break;
            }
--- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_list.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_list.java
@ -79,20 +79,11 @@ public class Module_list extends HTTPDModule
                    switch (admin.getRank())
                    {
                        case ADMIN:
-                        {
                            admins.add(player.getName());
                            break;
-                        }
                        case SENIOR_ADMIN:
-                        {
                            senioradmins.add(player.getName());
                            break;
-                        }
-                        default:
-                        {
-                            // Do nothing
-                            break;
-                        }
                    }
                }
            }
--- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java
@ -51,20 +51,11 @@ public class Module_players extends HTTPDModule
            switch (admin.getRank())
            {
                case ADMIN:
-                {
                    admins.add(username);
                    break;
-                }
                case SENIOR_ADMIN:
-                {
                    senioradmins.add(username);
                    break;
-                }
-                default:
-                {
-                    // Do nothing
-                    break;
-                }
            }
        }

--- a/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java
@ -1,5 +1,7 @@
 package me.totalfreedom.totalfreedommod.player;

+import java.util.ArrayList;
+import java.util.List;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.caging.CageData;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
@ -14,24 +16,21 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;

-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-public class FPlayer {
-
+public class FPlayer
+{
    public static final long AUTO_PURGE_TICKS = 5L * 60L * 20L;


    private final TotalFreedomMod plugin;

-    private final UUID uuid;
+    private final String name;
+
+    private final String ip;
    //
    private final FreezeData freezeData = new FreezeData(this);
    private final CageData cageData = new CageData(this);
    private final List<LivingEntity> mobThrowerQueue = new ArrayList<>();
    private Player player;
-    private PlayerData playerData;
    //
    private BukkitTask unmuteTask;
    private double fuckoffRadius = 0;
@ -70,520 +69,643 @@ public class FPlayer {

    private boolean invSee = false;

-
-    public FPlayer(TotalFreedomMod plugin, Player player) {
-        this(plugin, player.getUniqueId());
+    public FPlayer(TotalFreedomMod plugin, Player player)
+    {
+        this(plugin, player.getName(), FUtil.getIp(player));
    }

-    private FPlayer(TotalFreedomMod plugin, UUID uuid) {
+    private FPlayer(TotalFreedomMod plugin, String name, String ip)
+    {
        this.plugin = plugin;
-        this.uuid = uuid;
+        this.name = name;
+        this.ip = ip;
    }

-    public static long getAutoPurgeTicks() {
+    public static long getAutoPurgeTicks()
+    {
        return AUTO_PURGE_TICKS;
    }

-    public Player getPlayer() {
-        if (this.player == null) {
-            for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
-                if (onlinePlayer.getUniqueId().equals(this.uuid)) {
-                    this.player = onlinePlayer;
+    public Player getPlayer()
+    {
+        if (player != null && !player.isOnline())
+        {
+            player = null;
+        }
+
+        if (player == null)
+        {
+            for (Player onlinePlayer : Bukkit.getOnlinePlayers())
+            {
+                if (FUtil.getIp(onlinePlayer).equals(ip))
+                {
+                    player = onlinePlayer;
+                    break;
                }
            }
        }

-        return this.player;
+        return player;
    }

-    public void setPlayer(Player player) {
+    public void setPlayer(Player player)
+    {
        this.player = player;
    }

-    public boolean isOrbiting() {
+    public boolean isOrbiting()
+    {
        return isOrbiting;
    }

-    public void setOrbiting(boolean orbiting) {
+    public void setOrbiting(boolean orbiting)
+    {
        isOrbiting = orbiting;
    }

-    public void startOrbiting(double strength) {
+    public void startOrbiting(double strength)
+    {
        this.isOrbiting = true;
        this.orbitStrength = strength;
    }

-    public void stopOrbiting() {
+    public void stopOrbiting()
+    {
        this.isOrbiting = false;
    }

-    public double orbitStrength() {
+    public double orbitStrength()
+    {
        return orbitStrength;
    }

-    public boolean isFuckOff() {
+    public boolean isFuckOff()
+    {
        return fuckoffRadius > 0;
    }

-    public void setFuckoff(double radius) {
+    public void setFuckoff(double radius)
+    {
        this.fuckoffRadius = radius;
    }

-    public void disableFuckoff() {
+    public void disableFuckoff()
+    {
        this.fuckoffRadius = 0;
    }

-    public void resetMsgCount() {
+    public void resetMsgCount()
+    {
        this.messageCount = 0;
    }

-    public int incrementAndGetMsgCount() {
+    public int incrementAndGetMsgCount()
+    {
        return this.messageCount++;
    }

-    public int incrementAndGetBlockDestroyCount() {
+    public int incrementAndGetBlockDestroyCount()
+    {
        return this.totalBlockDestroy++;
    }

-    public void resetBlockDestroyCount() {
+    public void resetBlockDestroyCount()
+    {
        this.totalBlockDestroy = 0;
    }

-    public int incrementAndGetBlockPlaceCount() {
+    public int incrementAndGetBlockPlaceCount()
+    {
        return this.totalBlockPlace++;
    }

-    public void resetBlockPlaceCount() {
+    public void resetBlockPlaceCount()
+    {
        this.totalBlockPlace = 0;
    }

-    public int incrementAndGetFreecamDestroyCount() {
+    public int incrementAndGetFreecamDestroyCount()
+    {
        return this.freecamDestroyCount++;
    }

-    public void resetFreecamDestroyCount() {
+    public void resetFreecamDestroyCount()
+    {
        this.freecamDestroyCount = 0;
    }

-    public int incrementAndGetFreecamPlaceCount() {
+    public int incrementAndGetFreecamPlaceCount()
+    {
        return this.freecamPlaceCount++;
    }

-    public void resetFreecamPlaceCount() {
+    public void resetFreecamPlaceCount()
+    {
        this.freecamPlaceCount = 0;
    }

-    public void enableMobThrower(EntityType mobThrowerCreature, double mobThrowerSpeed) {
+    public void enableMobThrower(EntityType mobThrowerCreature, double mobThrowerSpeed)
+    {
        this.mobThrowerEnabled = true;
        this.mobThrowerEntity = mobThrowerCreature;
        this.mobThrowerSpeed = mobThrowerSpeed;
    }

-    public void disableMobThrower() {
+    public void disableMobThrower()
+    {
        this.mobThrowerEnabled = false;
    }

-    public EntityType mobThrowerCreature() {
+    public EntityType mobThrowerCreature()
+    {
        return this.mobThrowerEntity;
    }

-    public double mobThrowerSpeed() {
+    public double mobThrowerSpeed()
+    {
        return this.mobThrowerSpeed;
    }

-    public boolean mobThrowerEnabled() {
+    public boolean mobThrowerEnabled()
+    {
        return this.mobThrowerEnabled;
    }

-    public void enqueueMob(LivingEntity mob) {
+    public void enqueueMob(LivingEntity mob)
+    {
        mobThrowerQueue.add(mob);
-        if (mobThrowerQueue.size() > 4) {
+        if (mobThrowerQueue.size() > 4)
+        {
            LivingEntity oldmob = mobThrowerQueue.remove(0);
-            if (oldmob != null) {
+            if (oldmob != null)
+            {
                oldmob.damage(500.0);
            }
        }
    }

-    public void startArrowShooter(TotalFreedomMod plugin) {
+    public void startArrowShooter(TotalFreedomMod plugin)
+    {
        this.stopArrowShooter();
-        this.mp44ScheduleTask = new ArrowShooter(getPlayer()).runTaskTimer(plugin, 1L, 1L);
+        this.mp44ScheduleTask = new ArrowShooter(this.player).runTaskTimer(plugin, 1L, 1L);
        this.mp44Firing = true;
    }

-    public void stopArrowShooter() {
-        if (this.mp44ScheduleTask != null) {
+    public void stopArrowShooter()
+    {
+        if (this.mp44ScheduleTask != null)
+        {
            this.mp44ScheduleTask.cancel();
            this.mp44ScheduleTask = null;
        }
        this.mp44Firing = false;
    }

-    public void armMP44() {
+    public void armMP44()
+    {
        this.mp44Armed = true;
        this.stopArrowShooter();
    }

-    public void disarmMP44() {
+    public void disarmMP44()
+    {
        this.mp44Armed = false;
        this.stopArrowShooter();
    }

-    public boolean isMP44Armed() {
+    public boolean isMP44Armed()
+    {
        return this.mp44Armed;
    }

-    public boolean toggleMP44Firing() {
+    public boolean toggleMP44Firing()
+    {
        this.mp44Firing = !this.mp44Firing;
        return mp44Firing;
    }

-    public boolean isMuted() {
+    public boolean isMuted()
+    {
        return unmuteTask != null;
    }

-    public void setMuted(boolean muted, int minutes) {
+    public void setMuted(boolean muted, int minutes)
+    {
        FUtil.cancel(unmuteTask);
-        plugin.mu.MUTED_PLAYERS.remove(getPlayer().getUniqueId());
+        plugin.mu.MUTED_PLAYERS.remove(getPlayer().getName());
        unmuteTask = null;

-        if (!muted) {
+        if (!muted)
+        {
            return;
        }

-        if (getPlayer() == null) {
+        if (getPlayer() == null)
+        {
            return;
        }

-        plugin.mu.MUTED_PLAYERS.add(getPlayer().getUniqueId());
+        plugin.mu.MUTED_PLAYERS.add(getPlayer().getName());

        // TODO: Simplify this into a Consumer<BukkitTask> lambda?
-        unmuteTask = new BukkitRunnable() {
+        unmuteTask = new BukkitRunnable()
+        {
            @Override
-            public void run() {
-                if (getPlayer() != null) {
+            public void run()
+            {
+                if (getPlayer() != null)
+                {
                    FUtil.adminAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + getPlayer().getName(), false);
                    setMuted(false);
-                } else {
-                    FUtil.adminAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + Bukkit.getOfflinePlayer(uuid).getName(), false);
-                    plugin.mu.MUTED_PLAYERS.remove(uuid);
+                }
+                else
+                {
+                    FUtil.adminAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + getName(), false);
+                    plugin.mu.MUTED_PLAYERS.remove(getName());
                }
            }
        }.runTaskLater(plugin, minutes * (60L * 20L));
    }

-    public void setMuted(boolean muted) {
+    public void setMuted(boolean muted)
+    {
        setMuted(muted, 5);
    }

-    public BukkitTask getLockupScheduleID() {
+    public BukkitTask getLockupScheduleID()
+    {
        return this.lockupScheduleTask;
    }

-    public void setLockupScheduleId(BukkitTask id) {
+    public void setLockupScheduleId(BukkitTask id)
+    {
        this.lockupScheduleTask = id;
    }

-    public boolean isLockedUp() {
+    public boolean isLockedUp()
+    {
        return this.lockedUp;
    }

-    public void setLockedUp(boolean lockedUp) {
+    public void setLockedUp(boolean lockedUp)
+    {
        this.lockedUp = lockedUp;
    }

-    public String getLastMessage() {
+    public String getLastMessage()
+    {
        return lastMessage;
    }

-    public void setLastMessage(String message) {
+    public void setLastMessage(String message)
+    {
        this.lastMessage = message;
    }

-    public void setAdminChat(boolean inAdminchat) {
+    public void setAdminChat(boolean inAdminchat)
+    {
        this.inAdminchat = inAdminchat;
    }

-    public boolean inAdminChat() {
+    public boolean inAdminChat()
+    {
        return this.inAdminchat;
    }

-    public boolean allCommandsBlocked() {
+    public boolean allCommandsBlocked()
+    {
        return this.allCommandsBlocked;
    }

-    public void setCommandsBlocked(boolean commandsBlocked) {
+    public void setCommandsBlocked(boolean commandsBlocked)
+    {
        this.allCommandsBlocked = commandsBlocked;
    }

-    public String getLastCommand() {
+    public String getLastCommand()
+    {
        return lastCommand;
    }

-    public void setLastCommand(String lastCommand) {
+    public void setLastCommand(String lastCommand)
+    {
        this.lastCommand = lastCommand;
    }

-    public void setCommandSpy(boolean enabled) {
+    public void setCommandSpy(boolean enabled)
+    {
        this.cmdspyEnabled = enabled;
    }

-    public boolean cmdspyEnabled() {
+    public boolean cmdspyEnabled()
+    {
        return cmdspyEnabled;
    }

-    public String getTag() {
+    public String getTag()
+    {
        return this.tag;
    }

-    public void setTag(String tag) {
-        if (tag == null) {
+    public void setTag(String tag)
+    {
+        if (tag == null)
+        {
            this.tag = null;
-        } else {
+        }
+        else
+        {
            this.tag = FUtil.colorize(tag) + ChatColor.WHITE;
        }
    }

-    public int getWarningCount() {
+    public int getWarningCount()
+    {
        return this.warningCount;
    }

-    public void setWarningCount(int warningCount) {
+    public void setWarningCount(int warningCount)
+    {
        this.warningCount = warningCount;
    }

-    public void incrementWarnings(boolean quiet) {
+    public void incrementWarnings()
+    {
        this.warningCount++;

-        if (this.warningCount % 2 == 0) {
+        if (this.warningCount % 2 == 0)
+        {
            Player p = getPlayer();
-
-            if (!quiet) {
-                p.getWorld().strikeLightning(p.getLocation());
-            }
-
+            p.getWorld().strikeLightning(p.getLocation());
            FUtil.playerMsg(p, ChatColor.RED + "You have been warned at least twice now, make sure to read the rules at " + ConfigEntry.SERVER_BAN_URL.getString());
        }
    }

-    public TotalFreedomMod getPlugin() {
+    public TotalFreedomMod getPlugin()
+    {
        return plugin;
    }

-    public UUID getUniqueId() {
-        return uuid;
+    public String getName()
+    {
+        return name;
    }

-    public PlayerData getPlayerData() {
-        return playerData;
+    public String getIp()
+    {
+        return ip;
    }

-    public BukkitTask getUnmuteTask() {
+    public BukkitTask getUnmuteTask()
+    {
        return unmuteTask;
    }

-    public void setUnmuteTask(BukkitTask unmuteTask) {
+    public void setUnmuteTask(BukkitTask unmuteTask)
+    {
        this.unmuteTask = unmuteTask;
    }

-    public FreezeData getFreezeData() {
+    public FreezeData getFreezeData()
+    {
        return freezeData;
    }

-    public double getFuckoffRadius() {
+    public double getFuckoffRadius()
+    {
        return fuckoffRadius;
    }

-    public void setFuckoffRadius(double fuckoffRadius) {
+    public void setFuckoffRadius(double fuckoffRadius)
+    {
        this.fuckoffRadius = fuckoffRadius;
    }

-    public int getMessageCount() {
+    public int getMessageCount()
+    {
        return messageCount;
    }

-    public void setMessageCount(int messageCount) {
+    public void setMessageCount(int messageCount)
+    {
        this.messageCount = messageCount;
    }

-    public int getTotalBlockDestroy() {
+    public int getTotalBlockDestroy()
+    {
        return totalBlockDestroy;
    }

-    public void setTotalBlockDestroy(int totalBlockDestroy) {
+    public void setTotalBlockDestroy(int totalBlockDestroy)
+    {
        this.totalBlockDestroy = totalBlockDestroy;
    }

-    public int getTotalBlockPlace() {
+    public int getTotalBlockPlace()
+    {
        return totalBlockPlace;
    }

-    public void setTotalBlockPlace(int totalBlockPlace) {
+    public void setTotalBlockPlace(int totalBlockPlace)
+    {
        this.totalBlockPlace = totalBlockPlace;
    }

-    public int getFreecamDestroyCount() {
+    public int getFreecamDestroyCount()
+    {
        return freecamDestroyCount;
    }

-    public void setFreecamDestroyCount(int freecamDestroyCount) {
+    public void setFreecamDestroyCount(int freecamDestroyCount)
+    {
        this.freecamDestroyCount = freecamDestroyCount;
    }

-    public int getFreecamPlaceCount() {
+    public int getFreecamPlaceCount()
+    {
        return freecamPlaceCount;
    }

-    public void setFreecamPlaceCount(int freecamPlaceCount) {
+    public void setFreecamPlaceCount(int freecamPlaceCount)
+    {
        this.freecamPlaceCount = freecamPlaceCount;
    }

-    public CageData getCageData() {
+    public CageData getCageData()
+    {
        return cageData;
    }

-    public double getOrbitStrength() {
+    public double getOrbitStrength()
+    {
        return orbitStrength;
    }

-    public void setOrbitStrength(double orbitStrength) {
+    public void setOrbitStrength(double orbitStrength)
+    {
        this.orbitStrength = orbitStrength;
    }

-    public boolean isMobThrowerEnabled() {
+    public boolean isMobThrowerEnabled()
+    {
        return mobThrowerEnabled;
    }

-    public void setMobThrowerEnabled(boolean mobThrowerEnabled) {
+    public void setMobThrowerEnabled(boolean mobThrowerEnabled)
+    {
        this.mobThrowerEnabled = mobThrowerEnabled;
    }

-    public EntityType getMobThrowerEntity() {
+    public EntityType getMobThrowerEntity()
+    {
        return mobThrowerEntity;
    }

-    public void setMobThrowerEntity(EntityType mobThrowerEntity) {
+    public void setMobThrowerEntity(EntityType mobThrowerEntity)
+    {
        this.mobThrowerEntity = mobThrowerEntity;
    }

-    public double getMobThrowerSpeed() {
+    public double getMobThrowerSpeed()
+    {
        return mobThrowerSpeed;
    }

-    public void setPlayerData(PlayerData playerData) {
-        this.playerData = playerData;
-    }
-
-    public void setMobThrowerSpeed(double mobThrowerSpeed) {
+    public void setMobThrowerSpeed(double mobThrowerSpeed)
+    {
        this.mobThrowerSpeed = mobThrowerSpeed;
    }

-    public List<LivingEntity> getMobThrowerQueue() {
+    public List<LivingEntity> getMobThrowerQueue()
+    {
        return mobThrowerQueue;
    }

-    public BukkitTask getMp44ScheduleTask() {
+    public BukkitTask getMp44ScheduleTask()
+    {
        return mp44ScheduleTask;
    }

-    public void setMp44ScheduleTask(BukkitTask mp44ScheduleTask) {
+    public void setMp44ScheduleTask(BukkitTask mp44ScheduleTask)
+    {
        this.mp44ScheduleTask = mp44ScheduleTask;
    }

-    public boolean isMp44Armed() {
+    public boolean isMp44Armed()
+    {
        return mp44Armed;
    }

-    public void setMp44Armed(boolean mp44Armed) {
+    public void setMp44Armed(boolean mp44Armed)
+    {
        this.mp44Armed = mp44Armed;
    }

-    public boolean isMp44Firing() {
+    public boolean isMp44Firing()
+    {
        return mp44Firing;
    }

-    public void setMp44Firing(boolean mp44Firing) {
+    public void setMp44Firing(boolean mp44Firing)
+    {
        this.mp44Firing = mp44Firing;
    }

-    public BukkitTask getLockupScheduleTask() {
+    public BukkitTask getLockupScheduleTask()
+    {
        return lockupScheduleTask;
    }

-    public void setLockupScheduleTask(BukkitTask lockupScheduleTask) {
+    public void setLockupScheduleTask(BukkitTask lockupScheduleTask)
+    {
        this.lockupScheduleTask = lockupScheduleTask;
    }

-    public boolean isInAdminchat() {
+    public boolean isInAdminchat()
+    {
        return inAdminchat;
    }

-    public void setInAdminchat(boolean inAdminchat) {
+    public void setInAdminchat(boolean inAdminchat)
+    {
        this.inAdminchat = inAdminchat;
    }

-    public boolean isAllCommandsBlocked() {
+    public boolean isAllCommandsBlocked()
+    {
        return allCommandsBlocked;
    }

-    public void setAllCommandsBlocked(boolean allCommandsBlocked) {
+    public void setAllCommandsBlocked(boolean allCommandsBlocked)
+    {
        this.allCommandsBlocked = allCommandsBlocked;
    }

-    public boolean isSuperadminIdVerified() {
+    public boolean isSuperadminIdVerified()
+    {
        return superadminIdVerified;
    }

-    public void setSuperadminIdVerified(boolean superadminIdVerified) {
+    public void setSuperadminIdVerified(boolean superadminIdVerified)
+    {
        this.superadminIdVerified = superadminIdVerified;
    }

-    public boolean isCmdspyEnabled() {
+    public boolean isCmdspyEnabled()
+    {
        return cmdspyEnabled;
    }

-    public void setCmdspyEnabled(boolean cmdspyEnabled) {
+    public void setCmdspyEnabled(boolean cmdspyEnabled)
+    {
        this.cmdspyEnabled = cmdspyEnabled;
    }

-    public boolean isEditBlocked() {
+    public boolean isEditBlocked()
+    {
        return editBlocked;
    }

-    public void setEditBlocked(boolean editBlocked) {
+    public void setEditBlocked(boolean editBlocked)
+    {
        this.editBlocked = editBlocked;
    }

-    public boolean isPvpBlocked() {
+    public boolean isPvpBlocked()
+    {
        return pvpBlocked;
    }

-    public void setPvpBlocked(boolean pvpBlocked) {
+    public void setPvpBlocked(boolean pvpBlocked)
+    {
        this.pvpBlocked = pvpBlocked;
    }

-    public boolean isInvSee() {
+    public boolean isInvSee()
+    {
        return invSee;
    }

-    public void setInvSee(boolean invSee) {
+    public void setInvSee(boolean invSee)
+    {
        this.invSee = invSee;
    }

-    private static class ArrowShooter extends BukkitRunnable {
+    private static class ArrowShooter extends BukkitRunnable
+    {

        private final Player player;

-        private ArrowShooter(Player player) {
+        private ArrowShooter(Player player)
+        {
            this.player = player;
        }

        @Override
-        public void run() {
-            if (player != null) {
-                Arrow shot = player.launchProjectile(Arrow.class);
-                shot.setVelocity(shot.getVelocity().multiply(2.0));
-            }
+        public void run()
+        {
+            Arrow shot = player.launchProjectile(Arrow.class);
+            shot.setVelocity(shot.getVelocity().multiply(2.0));
        }
    }
 }
--- a/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerData.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerData.java
@ -3,8 +3,10 @@ package me.totalfreedom.totalfreedommod.player;
 import com.google.common.collect.Lists;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.*;
-
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.shop.ShopItem;
 import me.totalfreedom.totalfreedommod.util.FLog;
@ -18,7 +20,7 @@ public class PlayerData
    private final List<String> ips = Lists.newArrayList();
    private final List<String> notes = Lists.newArrayList();
    private final List<String> backupCodes = Lists.newArrayList();
-    private UUID uuid;
+    private String name;
    private String tag = null;
    private String discordID = null;
    private Boolean masterBuilder = false;
@ -46,7 +48,7 @@ public class PlayerData
    {
        try
        {
-            uuid = UUID.fromString(resultSet.getString("uuid"));
+            name = resultSet.getString("username");
            ips.clear();
            ips.addAll(FUtil.stringToList(resultSet.getString("ips")));
            notes.clear();
@ -86,13 +88,14 @@ public class PlayerData

    public PlayerData(Player player)
    {
-        this.uuid = player.getUniqueId();
+        this.name = player.getName();
    }

    @Override
    public String toString()
    {
-        return "Player: " + uuid.toString() + "\n" +
+
+        return "Player: " + name + "\n" +
                "- IPs: " + StringUtils.join(ips, ", ") + "\n" +
                "- Discord ID: " + discordID + "\n" +
                "- Master Builder: " + masterBuilder + "\n" +
@ -229,7 +232,7 @@ public class PlayerData
    {
        return new HashMap<String, Object>()
        {{
-            put("uuid", uuid);
+            put("username", name);
            put("ips", FUtil.listToString(ips));
            put("notes", FUtil.listToString(notes));
            put("tag", tag);
@ -252,14 +255,14 @@ public class PlayerData
        return displayDiscord;
    }

-    public UUID getUniqueId()
+    public String getName()
    {
-        return uuid;
+        return name;
    }

-    public void setUniqueId(UUID uuid)
+    public void setName(String name)
    {
-        this.uuid = uuid;
+        this.name = name;
    }

    public String getTag()
@ -361,9 +364,4 @@ public class PlayerData
    {
        this.inspect = inspect;
    }
-
-    public String getName()
-    {
-        return FUtil.getNameFromUUID(uuid);
-    }
 }
--- a/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java
@ -3,9 +3,11 @@ package me.totalfreedom.totalfreedommod.player;
 import com.google.common.collect.Maps;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.*;
-import java.util.stream.Collectors;
-
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
@ -18,12 +20,13 @@ import org.bukkit.entity.Player;
 public class PlayerList extends FreedomService
 {

-    public final Map<UUID, FPlayer> playerMap = Maps.newHashMap(); // uuid,dataMap
-    //public final Map<String, PlayerData> dataMap = Maps.newHashMap(); // username, data
+    public final Map<String, FPlayer> playerMap = Maps.newHashMap(); // ip,dataMap
+    public final Map<String, PlayerData> dataMap = Maps.newHashMap(); // username, data

    @Override
    public void onStart()
    {
+        dataMap.clear();
        loadMasterBuilders();
    }

@ -54,6 +57,7 @@ public class PlayerList extends FreedomService
            while (resultSet.next())
            {
                PlayerData playerData = load(resultSet);
+                dataMap.put(playerData.getName(), playerData);
            }
        }
        catch (SQLException e)
@ -69,20 +73,27 @@ public class PlayerList extends FreedomService
            return FUtil.getIp(Objects.requireNonNull(player.getPlayer()));
        }

-        final PlayerData entry = getData(player.getUniqueId());
+        final PlayerData entry = getData(player.getName());

        return (entry == null ? null : entry.getIps().iterator().next());
    }

    public List<String> getMasterBuilderNames()
    {
-        return playerMap.values().stream().map(FPlayer::getPlayerData).filter(PlayerData::isMasterBuilder).map(p -> FUtil.getNameFromUUID(p.getUniqueId())).collect(Collectors.toList());
+        List<String> masterBuilders = new ArrayList<>();
+        for (PlayerData playerData : plugin.pl.dataMap.values())
+        {
+            if (playerData.isMasterBuilder())
+            {
+                masterBuilders.add(playerData.getName());
+            }
+        }
+        return masterBuilders;
    }

-    public boolean canManageMasterBuilders(UUID uuid)
+    public boolean canManageMasterBuilders(String name)
    {
-        PlayerData data = getData(uuid);
-        String name = FUtil.getNameFromUUID(uuid);
+        PlayerData data = getData(name);

        return (!ConfigEntry.HOST_SENDER_NAMES.getStringList().contains(name.toLowerCase()) && data != null && !ConfigEntry.SERVER_OWNERS.getStringList().contains(data.getName()))
                && !ConfigEntry.SERVER_EXECUTIVES.getStringList().contains(data.getName())
@ -92,41 +103,31 @@ public class PlayerList extends FreedomService

    public boolean isTelnetMasterBuilder(PlayerData playerData)
    {
-        Admin admin = plugin.al.getEntryByUUID(playerData.getUniqueId());
+        Admin admin = plugin.al.getEntryByName(playerData.getName());
        return admin != null && admin.getRank().isAtLeast(Rank.ADMIN) && playerData.isMasterBuilder();
    }

    // May not return null
    public FPlayer getPlayer(Player player)
    {
-        FPlayer tPlayer = playerMap.get(player.getUniqueId());
+        FPlayer tPlayer = playerMap.get(FUtil.getIp(player));
        if (tPlayer != null)
        {
            return tPlayer;
        }

        tPlayer = new FPlayer(plugin, player);
-        playerMap.put(player.getUniqueId(), tPlayer);
+        playerMap.put(FUtil.getIp(player), tPlayer);

        return tPlayer;
    }

-    /*public PlayerData loadByName(String name)
+    public PlayerData loadByName(String name)
    {
        return load(plugin.sql.getPlayerByName(name));
    }

    public PlayerData loadByIp(String ip)
-    {
-        return load(plugin.sql.getPlayerByIp(ip));
-    }*/
-
-    public PlayerData loadByUUID(UUID uuid)
-    {
-        return load(plugin.sql.getPlayerByUUID(uuid));
-    }
-
-    private PlayerData loadByIp(String ip)
    {
        return load(plugin.sql.getPlayerByIp(ip));
    }
@ -167,7 +168,7 @@ public class PlayerList extends FreedomService

        if (plugin.al.isAdminImpostor(player))
        {
-            Admin admin = plugin.al.getEntryByUUID(player.getUniqueId());
+            Admin admin = plugin.al.getEntryByName(player.getName());
            admin.setLastLogin(new Date());
            admin.addIp(FUtil.getIp(player));
            plugin.al.updateTables();
@ -179,7 +180,7 @@ public class PlayerList extends FreedomService

    public void syncIps(Admin admin)
    {
-        PlayerData playerData = getData(admin.getUniqueId());
+        PlayerData playerData = getData(admin.getName());
        playerData.clearIps();
        playerData.addIps(admin.getIps());
        plugin.pl.save(playerData);
@ -187,7 +188,7 @@ public class PlayerList extends FreedomService

    public void syncIps(PlayerData playerData)
    {
-        Admin admin = plugin.al.getEntryByUUID(playerData.getUniqueId());
+        Admin admin = plugin.al.getEntryByName(playerData.getName());

        if (admin != null && admin.isActive())
        {
@ -203,7 +204,7 @@ public class PlayerList extends FreedomService
    {
        try
        {
-            ResultSet currentSave = plugin.sql.getPlayerByUUID(player.getUniqueId());
+            ResultSet currentSave = plugin.sql.getPlayerByName(player.getName());
            for (Map.Entry<String, Object> entry : player.toSQLStorable().entrySet())
            {
                Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue());
@ -222,32 +223,31 @@ public class PlayerList extends FreedomService
    public PlayerData getData(Player player)
    {
        // Check for existing data
-        PlayerData playerData = playerMap.get(player.getUniqueId()).getPlayerData();
+        PlayerData playerData = dataMap.get(player.getName());
        if (playerData != null)
        {
            return playerData;
        }

        // Load data
-        playerData = loadByUUID(player.getUniqueId());
+        playerData = loadByName(player.getName());

-        /*if (playerData == null)
+        if (playerData == null)
        {
            playerData = loadByIp(FUtil.getIp(player));
            if (playerData != null)
            {
                plugin.sql.updatePlayerName(playerData.getName(), player.getName());
-                playerMap.get(player.getUniqueId()).setPlayerData(playerData);
+                playerData.setName(player.getName());
+                dataMap.put(player.getName(), playerData);
                return playerData;
            }
        }
        else
        {
-            playerMap.get(player.getUniqueId()).setPlayerData(playerData);
+            dataMap.put(player.getName(), playerData);
            return playerData;
-        }*/
-
-        playerMap.get(player.getUniqueId()).setPlayerData(playerData);
+        }

        // Create new data if nonexistent
        FLog.info("Creating new player verification entry for " + player.getName());
@ -257,7 +257,7 @@ public class PlayerList extends FreedomService
        playerData.addIp(FUtil.getIp(player));

        // Store player
-        playerMap.get(player.getUniqueId()).setPlayerData(playerData);
+        dataMap.put(player.getName(), playerData);

        // Save player
        plugin.sql.addPlayer(playerData);
@ -265,10 +265,8 @@ public class PlayerList extends FreedomService

    }

-    /*@Deprecated
    public PlayerData getData(String username)
    {
-        throw new UnsupportedOperationException();
        // Check for existing data
        PlayerData playerData = dataMap.get(username);
        if (playerData != null)
@ -287,58 +285,28 @@ public class PlayerList extends FreedomService
            return null;
        }

-        return playerData;
-    }*/
-
-    public PlayerData getData(UUID uuid)
-    {
-        PlayerData playerData = playerMap.get(uuid).getPlayerData();
-        if (playerData != null)
-        {
-            return playerData;
-        }
-
-        playerData = loadByUUID(uuid);
-
-        if (playerData != null)
-        {
-            playerMap.get(uuid).setPlayerData(playerData);
-        }
-        else
-        {
-            return null;
-        }
-
        return playerData;
    }

-    public PlayerData getDataByUUID(UUID uuid)
-    {
-        PlayerData player = loadByUUID(uuid);
-
-        if (player != null)
-        {
-            playerMap.get(uuid).setPlayerData(player);
-        }
-
-        return player;
-    }
-
-     public PlayerData getDataByIp(String ip)
+    public PlayerData getDataByIp(String ip)
    {
        PlayerData player = loadByIp(ip);

        if (player != null)
        {
-            playerMap.get(player.getUniqueId()).setPlayerData(player);
+            dataMap.put(player.getName(), player);
        }

        return player;
    }

-    public Map<UUID, FPlayer> getPlayerMap()
+    public Map<String, FPlayer> getPlayerMap()
    {
        return playerMap;
    }

+    public Map<String, PlayerData> getDataMap()
+    {
+        return dataMap;
+    }
 }
--- a/src/main/java/me/totalfreedom/totalfreedommod/punishments/PunishmentType.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/punishments/PunishmentType.java
@ -7,11 +7,5 @@ public enum PunishmentType
    KICK,
    TEMPBAN,
    BAN,
-    DOOM,
-    WARN,
-    CAGE,
-    BLOCKEDIT,
-    BLOCKPVP,
-    BLOCKCMD,
-    ORBIT
+    DOOM
 }
--- a/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java
@ -117,7 +117,7 @@ public class RankManager extends FreedomService
        }

        // Console admin, get by name
-        Admin admin = plugin.al.getEntryByUUID(FUtil.getUUIDFromName(sender.getName()));
+        Admin admin = plugin.al.getEntryByName(sender.getName());

        // Unknown console: RCON?
        if (admin == null)
--- a/src/main/java/me/totalfreedom/totalfreedommod/shop/Votifier.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/shop/Votifier.java
@ -37,7 +37,7 @@ public class Votifier extends FreedomService
        }
        else
        {
-            data = plugin.pl.getData(FUtil.getUUIDFromName(name));
+            data = plugin.pl.getData(name);
        }

        if (data != null)
--- a/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java
@ -7,8 +7,6 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.MessageFormat;
-import java.util.UUID;
-
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.banning.Ban;
@ -72,7 +70,6 @@ public class SQLite extends FreedomService
            {
                try
                {
-                    //TODO: move bans to uuid
                    connection.createStatement().execute("CREATE TABLE `bans` (`name` VARCHAR, `uuid` VARCHAR, `ips` VARCHAR, `by` VARCHAR NOT NULL, `at` LONG NOT NULL, `expires` LONG, `reason` VARCHAR);");
                }
                catch (SQLException e)
@ -85,7 +82,7 @@ public class SQLite extends FreedomService
            {
                try
                {
-                    connection.createStatement().execute("CREATE TABLE `admins` (`uuid` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `rank` VARCHAR NOT NULL, `active` BOOLEAN NOT NULL, `last_login` LONG NOT NULL, `command_spy` BOOLEAN NOT NULL, `potion_spy` BOOLEAN NOT NULL, `ac_format` VARCHAR, `ptero_id` VARCHAR);");
+                    connection.createStatement().execute("CREATE TABLE `admins` (`username` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `rank` VARCHAR NOT NULL, `active` BOOLEAN NOT NULL, `last_login` LONG NOT NULL, `command_spy` BOOLEAN NOT NULL, `potion_spy` BOOLEAN NOT NULL, `ac_format` VARCHAR, `ptero_id` VARCHAR);");
                }
                catch (SQLException e)
                {
@ -96,7 +93,7 @@ public class SQLite extends FreedomService
            {
                try
                {
-                    connection.createStatement().execute("CREATE TABLE `players` (`uuid` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `notes` VARCHAR, `tag` VARCHAR, `discord_id` VARCHAR, `backup_codes` VARCHAR, `master_builder` BOOLEAN NOT NULL,`verification` BOOLEAN NOT NULL, `ride_mode` VARCHAR NOT NULL, `coins` INT, `items` VARCHAR, `total_votes` INT NOT NULL, `display_discord` BOOLEAN NOT NULL, `login_message` VARCHAR, `inspect` BOOLEAN NOT NULL);");
+                    connection.createStatement().execute("CREATE TABLE `players` (`username` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `notes` VARCHAR, `tag` VARCHAR, `discord_id` VARCHAR, `backup_codes` VARCHAR, `master_builder` BOOLEAN NOT NULL,`verification` BOOLEAN NOT NULL, `ride_mode` VARCHAR NOT NULL, `coins` INT, `items` VARCHAR, `total_votes` INT NOT NULL, `display_discord` BOOLEAN NOT NULL, `login_message` VARCHAR, `inspect` BOOLEAN NOT NULL);");
                }
                catch (SQLException e)
                {
@ -136,8 +133,8 @@ public class SQLite extends FreedomService
    {
        try
        {
-            Object[] data = {key, admin.getUniqueId().toString()};
-            PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE admins SET {0}=? WHERE uuid=''{1}''", data));
+            Object[] data = {key, admin.getName()};
+            PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE admins SET {0}=? WHERE username=''{1}''", data));
            statement = setUnknownType(statement, 1, value);
            statement.executeUpdate();

@ -153,8 +150,8 @@ public class SQLite extends FreedomService
    {
        try
        {
-            Object[] data = {key, player.getUniqueId().toString()};
-            PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE players SET {0}=? WHERE uuid=''{1}''", data));
+            Object[] data = {key, player.getName()};
+            PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE players SET {0}=? WHERE username=''{1}''", data));
            statement = setUnknownType(statement, 1, value);
            statement.executeUpdate();

@ -165,11 +162,9 @@ public class SQLite extends FreedomService
        }
    }

-    @Deprecated
-    public void oldUpdateAdminName(String oldName, String newName)
+    public void updateAdminName(String oldName, String newName)
    {
-        throw new UnsupportedOperationException("Admin no longer stores names in the object, may be changed in a future update");
-        /*try
+        try
        {
            PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE admins SET username=? WHERE username=''{0}''", oldName));
            statement = setUnknownType(statement, 1, newName);
@ -179,10 +174,10 @@ public class SQLite extends FreedomService
        catch (SQLException e)
        {
            FLog.severe("Failed to update admin name: " + e.getMessage());
-        }*/
+        }
    }

-    /*public void updatePlayerName(String oldName, String newName)
+    public void updatePlayerName(String oldName, String newName)
    {
        try
        {
@ -195,7 +190,7 @@ public class SQLite extends FreedomService
        {
            FLog.severe("Failed to update player name: " + e.getMessage());
        }
-    }*/
+    }

    public PreparedStatement setUnknownType(PreparedStatement statement, int index, Object value) throws SQLException
    {
@ -253,7 +248,7 @@ public class SQLite extends FreedomService
        try
        {
            PreparedStatement statement = connection.prepareStatement("INSERT INTO admins VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)");
-            statement.setString(1, admin.getUniqueId().toString());
+            statement.setString(1, admin.getName());
            statement.setString(2, FUtil.listToString(admin.getIps()));
            statement.setString(3, admin.getRank().toString());
            statement.setBoolean(4, admin.isActive());
@ -276,7 +271,7 @@ public class SQLite extends FreedomService
        try
        {
            PreparedStatement statement = connection.prepareStatement("INSERT INTO players VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
-            statement.setString(1, player.getUniqueId().toString());
+            statement.setString(1, player.getName());
            statement.setString(2, FUtil.listToString(player.getIps()));
            statement.setString(3, FUtil.listToString(player.getNotes()));
            statement.setString(4, player.getTag());
@ -300,7 +295,7 @@ public class SQLite extends FreedomService
        }
    }

-    /*public ResultSet getAdminByName(String name)
+    public ResultSet getAdminByName(String name)
    {
        try
        {
@ -316,29 +311,10 @@ public class SQLite extends FreedomService
            FLog.severe(e);
        }

-        return null;
-    }*/
-
-    public ResultSet getAdminByUUID(UUID uuid)
-    {
-        try
-        {
-            ResultSet resultSet = connection.createStatement().executeQuery(MessageFormat.format("SELECT * FROM admins WHERE uuid=''{0}''", uuid.toString()));
-            if (resultSet.next())
-            {
-                return resultSet;
-            }
-        }
-        catch (SQLException e)
-        {
-            FLog.severe("Failed to get admin by name:");
-            FLog.severe(e);
-        }
-
        return null;
    }

-    /*public ResultSet getPlayerByName(String name)
+    public ResultSet getPlayerByName(String name)
    {
        try
        {
@ -356,8 +332,6 @@ public class SQLite extends FreedomService

        return null;
    }
-*/
-

    public ResultSet getMasterBuilders()
    {
@ -374,25 +348,6 @@ public class SQLite extends FreedomService
        return null;
    }

-    public ResultSet getPlayerByUUID(UUID uuid)
-    {
-        try
-        {
-            ResultSet resultSet = connection.createStatement().executeQuery(MessageFormat.format("SELECT * FROM players WHERE uuid LIKE ''%{0}%''", uuid.toString()));
-            if (resultSet.next())
-            {
-                return resultSet;
-            }
-        }
-        catch (SQLException e)
-        {
-            FLog.severe("Failed to get player by uuid:");
-            FLog.severe(e);
-        }
-
-        return null;
-    }
-
    public ResultSet getPlayerByIp(String ip)
    {
        try
@ -416,7 +371,7 @@ public class SQLite extends FreedomService
    {
        try
        {
-            connection.createStatement().executeUpdate(MessageFormat.format("DELETE FROM admins where uuid=''{0}''", admin.getUniqueId()));
+            connection.createStatement().executeUpdate(MessageFormat.format("DELETE FROM admins where name=''{0}''", admin.getName()));
        }
        catch (SQLException e)
        {
--- a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java
@ -1,18 +1,16 @@
 package me.totalfreedom.totalfreedommod.util;

-import com.google.common.collect.Maps;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.WordUtils;
-import org.apache.hc.client5.http.classic.methods.HttpGet;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
-import org.apache.hc.client5.http.impl.classic.HttpClients;
-import org.apache.hc.core5.http.HttpResponse;
-import org.apache.hc.core5.http.io.entity.EntityUtils;
-import org.bukkit.*;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Color;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@ -21,14 +19,12 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
-import org.json.JSONObject;
 import org.json.simple.JSONArray;

 import java.io.*;
 import java.lang.reflect.Field;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
@ -41,8 +37,6 @@ import static org.bukkit.Bukkit.getServer;
 public class FUtil
 {

-    private static final Map<UUID, String> NAME_CACHE = Maps.newHashMap();
-
    public static final String SAVED_FLAGS_FILENAME = "savedflags.dat";
    /* See https://github.com/TotalFreedom/License - None of the listed names may be removed.
    Leaving this list here for anyone running TFM on a cracked server:
@ -889,52 +883,4 @@ public class FUtil
            return subList(startIndex, endIndex + 1);
        }
    }
-
-    public static String getNameFromUUID(UUID uuid) {
-
-        OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
-        if (player.hasPlayedBefore()) return player.getName();
-        if (NAME_CACHE.containsKey(uuid)) return NAME_CACHE.get(uuid);
-
-        CloseableHttpClient client = HttpClients.createDefault();
-        HttpGet get = new HttpGet("https://api.ashcon.app/mojang/v2/user/" + uuid.toString().replace("-", ""));
-        try {
-            CloseableHttpResponse response = client.execute(get);
-            String json = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
-            JSONObject obj = new JSONObject(json);
-            response.close();
-            if (response.getCode() == 200) {
-                String name = NAME_CACHE.put(uuid, obj.getString("username"));
-
-                Bukkit.getScheduler().runTaskLaterAsynchronously(TotalFreedomMod.getPlugin(), () -> NAME_CACHE.remove(uuid), 20 * 60L * 5); // remove the uuid from cache as names can be changed
-                return name;
-            }
-            client.close();
-        } catch (IOException | org.apache.hc.core5.http.ParseException e) {
-            e.printStackTrace();
-        }
-        return "";
-    }
-
-    public static UUID getUUIDFromName(String name) {
-        //get offline player is deprecated so we'll just see if they're online to get their uuid
-        Player player = Bukkit.getPlayer(name);
-        if (player != null) return player.getUniqueId();
-
-        CloseableHttpClient client = HttpClients.createDefault();
-        HttpGet get = new HttpGet("https://api.ashcon.app/mojang/v2/user/" + name);
-        try {
-            CloseableHttpResponse response = client.execute(get);
-            String json = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
-            JSONObject obj = new JSONObject(json);
-            response.close();
-            if (response.getCode()  == 200) {
-                return UUID.fromString(obj.getString("uuid"));
-            }
-            client.close();
-        } catch (IOException | org.apache.hc.core5.http.ParseException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
 }
--- a/src/main/java/me/totalfreedom/totalfreedommod/world/WorldRestrictions.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/world/WorldRestrictions.java
@ -52,7 +52,7 @@ public class WorldRestrictions extends FreedomService

    public boolean doRestrict(Player player)
    {
-        if (!plugin.pl.getData(player).isMasterBuilder() && plugin.pl.canManageMasterBuilders(player.getUniqueId()))
+        if (!plugin.pl.getData(player).isMasterBuilder() && plugin.pl.canManageMasterBuilders(player.getName()))
        {
            if (player.getWorld().equals(plugin.wm.masterBuilderWorld.getWorld()))
            {
--- a/src/main/resources/permissions.yml
+++ b/src/main/resources/permissions.yml
@ -1,50 +1,16 @@
 #
-# TotalFreedomMod 5.5 Permissions
+# TotalFreedomMod Permissions
 # by ZeroEpoch1969
 #

 # Note that every group inherits the previous groups' permissions
-# Meaning Telnet Admins have the permissions of Operators and Super Admins, and etc
+# Meaning Senior Admins have the permissions of Operators and Admins, and etc

 # This is used to remove all permission begging with the root node
 # This is useful when a plugin gives all permissions to a player because they are opped
 remove:
  - "voxelsniper"
-  - "bending.admin"
-  - "bending.ability.Cleanse"
-  - "worldedit.brush.apply"
-  - "essentials.near.exclude"
-  - "plots.admin"
-  - "plots.debugroadregen"
-  - "plots.debugclaimtest"
-  - "plots.debugpaste"
-  - "plots.debugallowunsafe"
-  - "plots.debugloadtest"
-  - "plots.debugsavetest"
-  - "plots.cluster"
-  #Crackshot
-  - "crackshot.bypass.all"
-  #NetworkManager
-  - "networkmanager.*" 
-  - "networkmanager.notify.joinbanned"
-  - "networkmanager.notify.*"
-  - "networkmanager.announce.global"
-  - "networkmanager.announce"
-  - "networkmanager.chatlock"
-  - "networkmanager.clearchat.bypass"
-  - "networkmanager.clearchat.*"
-  - "networkmanager.notify.ticket.new"
-  - "networkmanager.lookup"
-  - "networkmanager.maintenance.*"
-  - "networkmanager.permissions"
-  - "networkmanager.reports"
-  - "networkmanager.tickets"
-  - "networkmanager.chatlock.bypass"
-  - "networkmanager.anticaps.bypass"
-  - "networkmanager.antispam.bypass"
-  - "networkmanager.commandblocker.bypass"
-  - "networkmanager.tags.*"
-
+  - "bending"

 # Operator permission nodes
 operators:
@ -70,79 +36,16 @@ operators:
  - "worldedit.removebelow"
  - "worldedit.removenear"
  - "worldedit.replacenear"
-  - "worldedit.brush.*"
-  - "worldedit.global-mask"
-  - "worldedit.fill"
-  - "worldedit.fill.recursive"
+
  # LibsDisguises
  - "libsdisguises.noactionbar"
-  
+
  # WorldGuard
  - "worldguard.region.list.own"
  - "worldguard.region.addmember.own.*"
  - "worldguard.region.removemember.own.*"
  - "worldguard.region.info.*"

-  # Bending
-  - "bending.command.add"
-  - "bending.command.bind"
-  - "bending.command.check"
-  - "bending.command.choose"
-  - "bending.command.rechoose"
-  - "bending.command.clear"
-  - "bending.command.copy"
-  - "bending.command.display"
-  - "bending.command.help"
-  - "bending.command.invincible"
-  - "bending.command.preset"
-  - "bending.command.preset.list"
-  - "bending.command.preset.create"
-  - "bending.command.preset.delete"
-  - "bending.command.preset.bind"
-  - "bending.command.preset.bind.assign"
-  - "bending.command.preset.bind.external"
-  - "bending.command.toggle"
-  - "bending.command.version"
-  - "bending.command.who"
-  - "bending.earth"
-  - "bending.air"
-  - "bending.fire"
-  - "bending.water"
-  - "bending.water.bloodbending.anytime"
-  - "bending.ability.AvatarState"
-  - "bending.command.add.chi"
-  - "bending.command.choose.chi"
-  - "bending.ability.Paralyze"
-  - "bending.ability.RapidPunch"
-  - "bending.ability.Smokescreen"
-  - "bending.ability.WarriorStance"
-  - "bending.ability.AcrobatStance"
-  - "bending.ability.QuickStrike"
-  - "bending.ability.SwiftKick"
-  - "bending.ability.ChiCombo"
-  - "bending.chi.passive"
-  - "bending.ability.MetalClips.throw"
-  - "bending.ability.AirCombo"
-  - "bending.ability.Flight"
-  - "bending.ability.WaterCombo"
-  - "bending.ability.EarthCombo"
-  - "bending.ability.FireCombo"
-  - "bending.ability.ChiCombo"
-  - "bending.air.passive"
-  - "bending.chi.passive"
-  - "bending.earth.passive"
-  - "bending.fire.passive"
-  - "bending.water.passive"
-  # NetworkManager
-  - "networkmanager.chatlog"
-  - "networkmanager.find"
-  - "networkmanager.gtps"
-  - "networkmanager.lookup"
-  - "networkmanager.slashserver.*"
-  - "networkmanager.notification.join"
-  - "networkmanager.party.nolimit"
-  - "networkmanager.tabcompletechat"
-  
 # Master Builder permission nodes
 master_builders:
  - "worldedit.tool.*"
@ -156,25 +59,13 @@ master_builders:
  - "voxelsniper.sniper"
  - "voxelsniper.goto"
  - "voxelsniper.brush.*"
-  
+
 # Admin permission nodes
 admins:
+  - "coreprotect.*"
  - "worldedit.*"
  - "worldguard.*"
-  - "bending.admin.remove"
-  - "bending.command.toggle.all"
-  - "bending.admin.toggle"
-  - "bending.command.reload"
-  - "plots.cluster"
-  - "networkmanager.adminchat"
-  - "networkmanager.announce.server"
-  - "networkmanager.socialspy"
-  - "networkmanager.fullproxy.bypass"
-  - "networkmanager.lookup.ip"
-  #Crackshot
-  - "crackshot.bypass.all"
+  - "bending.*"

 # Senior Admin permission nodes
-senior_admins: 
-  - "bending.admin.permaremove"
-  - "bending.ability.Cleanse"
+senior_admins: []
Author	SHA1	Message	Date
Nathan Curran	86a8e21d06	TotalFreedomMod May Update	2021-06-06 14:06:01 +10:00
Nathan Curran	da37ca52fa	Bump version	2021-05-27 11:35:11 +10:00