Move repository related configuration to GUI. (#151)

25 files changed, 251 insertions, 197 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
index b28aace6..ea92a670 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
@@ -35,10 +35,8 @@ import net.minecraft.nbt.NBTTagString;
 import net.minecraft.util.ResourceLocation;
 import org.apache.commons.io.FileUtils;
 import org.lwjgl.input.Keyboard;
-import org.lwjgl.opengl.Display;
 
 import javax.net.ssl.HttpsURLConnection;
-import javax.swing.*;
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -55,6 +53,7 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Base64;
 import java.util.Collections;
 import java.util.HashMap;
@@ -109,10 +108,6 @@ public class NEUManager {
 
 	private final Map<String, ItemStack> itemstackCache = new HashMap<>();
 
-	private static String GIT_COMMITS_URL;
-
-	// TODO: private final Map<String, NeuItem>
-
 	private final Set<NeuRecipe> recipes = new HashSet<>();
 	private final HashMap<String, Set<NeuRecipe>> recipesMap = new HashMap<>();
 	private final HashMap<String, Set<NeuRecipe>> usagesMap = new HashMap<>();
@@ -136,8 +131,6 @@ public class NEUManager {
 		this.craftingOverlay = new CraftingOverlay(this);
 		this.katSitterOverlay = new KatSitterOverlay();
 
-		GIT_COMMITS_URL = neu.config.hidden.repoCommitsURL;
-
 		gson = new GsonBuilder().setPrettyPrinting().create();
 
 		this.repoLocation = new File(configLocation, "repo");
@@ -200,7 +193,7 @@ public class NEUManager {
 				JsonObject currentCommitJSON = getJsonFromFile(new File(configLocation, "currentCommit.json"));
 
 				latestRepoCommit = null;
-				try (Reader inReader = new InputStreamReader(new URL(GIT_COMMITS_URL).openStream())) {
+				try (Reader inReader = new InputStreamReader(new URL(neu.config.apiData.getCommitApiUrl()).openStream())) {
 					JsonObject commits = gson.fromJson(inReader, JsonObject.class);
 					latestRepoCommit = commits.get("sha").getAsString();
 				} catch (Exception e) {
@@ -216,8 +209,6 @@ public class NEUManager {
 				Utils.recursiveDelete(repoLocation);
 				repoLocation.mkdirs();
 
-				String dlUrl = neu.config.hidden.repoURL;
-
 				File itemsZip = new File(repoLocation, "neu-items-master.zip");
 				try {
 					itemsZip.createNewFile();
@@ -225,7 +216,7 @@ public class NEUManager {
 					return false;
 				}
 
-				URL url = new URL(dlUrl);
+				URL url = new URL(neu.config.apiData.getDownloadUrl(latestRepoCommit));
 				URLConnection urlConnection = url.openConnection();
 				urlConnection.setConnectTimeout(15000);
 				urlConnection.setReadTimeout(30000);
@@ -238,7 +229,6 @@ public class NEUManager {
 					return false;
 				}
 
-
 				unzipIgnoreFirstFolder(itemsZip.getAbsolutePath(), repoLocation.getAbsolutePath());
 
 				if (currentCommitJSON == null || !currentCommitJSON.get("sha").getAsString().equals(latestRepoCommit)) {
@@ -261,10 +251,8 @@ public class NEUManager {
 	 * downloading of new/updated files. This then calls the "loadItem" method for every item in the local repository.
 	 */
 	public void loadItemInformation() {
-		if (NotEnoughUpdates.INSTANCE.config.hidden.autoupdate) {
-			fetchRepository().thenAccept(i -> {
-				reloadRepository();
-			});
+		if (NotEnoughUpdates.INSTANCE.config.apiData.autoupdate) {
+			fetchRepository().thenRun(this::reloadRepository);
 		} else {
 			reloadRepository();
 		}
@@ -1485,26 +1473,64 @@ public class NEUManager {
 		}
 	}
 
-	public void reloadRepository() {
+	public CompletableFuture<List<String>> userFacingRepositoryReload() {
+		String lastCommit = NotEnoughUpdates.INSTANCE.manager.latestRepoCommit;
+		NotEnoughUpdates.INSTANCE.manager.resetRepo();
+		return NotEnoughUpdates.INSTANCE.manager
+			.fetchRepository()
+			.thenCompose(ignored -> NotEnoughUpdates.INSTANCE.manager.reloadRepository())
+			.<List<String>>thenApply(ignored -> {
+				String newCommitHash = NotEnoughUpdates.INSTANCE.manager.latestRepoCommit;
+				String newCommitShortHash = (newCommitHash == null ? "MISSING" : newCommitHash.substring(0, 7));
+				return Arrays.asList(
+					"§aRepository reloaded.",
+					(lastCommit == null
+						? "§eYou downloaded the repository version §b" + newCommitShortHash + "§e."
+						: "§eYou updated your repository from §b" + lastCommit.substring(0, 7) + "§e to §b" +
+							newCommitShortHash + "§e."
+					)
+				);
+			})
+			.exceptionally(ex -> {
+				ex.printStackTrace();
+				return Arrays.asList(
+					"§cRepository not fully reloaded.",
+					"§cThere was an error reloading your repository.",
+					"§cThis might be caused by an outdated version of neu",
+					"§c(or by not using the dangerous repository if you are using a prerelease of neu).",
+					"§aYour repository will still work, but is in a suboptimal state.",
+					"§eJoin §bdiscord.gg/moulberry §efor help."
+				);
+			});
+	}
+
+	public CompletableFuture<Void> reloadRepository() {
+		CompletableFuture<Void> comp = new CompletableFuture<>();
 		Minecraft.getMinecraft().addScheduledTask(() -> {
-			File items = new File(repoLocation, "items");
-			if (items.exists()) {
-				recipes.clear();
-				recipesMap.clear();
-				usagesMap.clear();
-
-				File[] itemFiles = new File(repoLocation, "items").listFiles();
-				if (itemFiles != null) {
-					for (File f : itemFiles) {
-						String internalname = f.getName().substring(0, f.getName().length() - 5);
-						loadItem(internalname);
+			try {
+				File items = new File(repoLocation, "items");
+				if (items.exists()) {
+					recipes.clear();
+					recipesMap.clear();
+					usagesMap.clear();
+
+					File[] itemFiles = new File(repoLocation, "items").listFiles();
+					if (itemFiles != null) {
+						for (File f : itemFiles) {
+							String internalname = f.getName().substring(0, f.getName().length() - 5);
+							loadItem(internalname);
+						}
 					}
 				}
-			}
 
-			new RepositoryReloadEvent(repoLocation, !hasBeenLoadedBefore).post();
-			hasBeenLoadedBefore = true;
+				new RepositoryReloadEvent(repoLocation, !hasBeenLoadedBefore).post();
+				hasBeenLoadedBefore = true;
+				comp.complete(null);
+			} catch (Exception e) {
+				comp.completeExceptionally(e);
+			}
 		});
+		return comp;
 	}
 
 	public ItemStack createItem(String internalname) {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
index d7b6db4b..b8651867 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
@@ -1135,7 +1135,7 @@ public class NEUOverlay extends Gui {
 				}
 				if (internalname.get() != null) {
 					if (itemstack.get() != null) {
-						if (NotEnoughUpdates.INSTANCE.config.hidden.enableItemEditing && Keyboard.getEventCharacter() == 'k') {
+						if (NotEnoughUpdates.INSTANCE.config.apiData.repositoryEditing && Keyboard.getEventCharacter() == 'k') {
 							Minecraft.getMinecraft().displayGuiScreen(new NEUItemEditor(
 								internalname.get(),
 								manager.getJsonForItem(itemstack.get())
@@ -1159,7 +1159,7 @@ public class NEUOverlay extends Gui {
 								Minecraft.getMinecraft().thePlayer.inventory.addItemStackToInventory(
 									manager.jsonToStack(item));
 							}
-						} else if (NotEnoughUpdates.INSTANCE.config.hidden.enableItemEditing &&
+						} else if (NotEnoughUpdates.INSTANCE.config.apiData.repositoryEditing &&
 							Keyboard.getEventCharacter() == 'k') {
 							Minecraft.getMinecraft().displayGuiScreen(new NEUItemEditor(internalname.get(), item));
 							return true;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
index 77499d59..cac89e77 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
@@ -208,6 +208,11 @@ public class NotEnoughUpdates {
 		if (config == null) {
 			config = new NEUConfig();
 			saveConfig();
+		} else {
+			if (config.apiKey != null && config.apiKey.apiKey != null) {
+				config.apiData.apiKey = config.apiKey.apiKey;
+				config.apiKey = null;
+			}
 		}
 
 		MinecraftForge.EVENT_BUS.register(this);
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java b/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java
index cb2f06d6..80d2bca9 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java
@@ -183,8 +183,8 @@ public class APIManager {
 		customAH.tick();
 		long currentTime = System.currentTimeMillis();
 		if (NotEnoughUpdates.INSTANCE.config.neuAuctionHouse.enableNeuAuctionHouse &&
-			NotEnoughUpdates.INSTANCE.config.apiKey.apiKey != null &&
-			!NotEnoughUpdates.INSTANCE.config.apiKey.apiKey.isEmpty()) {
+			NotEnoughUpdates.INSTANCE.config.apiData.apiKey != null &&
+			!NotEnoughUpdates.INSTANCE.config.apiData.apiKey.isEmpty()) {
 			if (currentTime - lastAuctionUpdate > 60 * 1000) {
 				lastAuctionUpdate = currentTime;
 				updatePageTick();
@@ -675,7 +675,7 @@ public class APIManager {
 
 	public void updateBazaar() {
 		manager.hypixelApi.getHypixelApiAsync(
-			NotEnoughUpdates.INSTANCE.config.apiKey.apiKey,
+			NotEnoughUpdates.INSTANCE.config.apiData.apiKey,
 			"skyblock/bazaar",
 			new HashMap<>(),
 			(jsonObject) -> {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java
index 5c2bf5c0..ea401eb7 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java
@@ -14,9 +14,6 @@ import io.github.moulberry.notenoughupdates.commands.profile.CataCommand;
 import io.github.moulberry.notenoughupdates.commands.profile.PeekCommand;
 import io.github.moulberry.notenoughupdates.commands.profile.PvCommand;
 import io.github.moulberry.notenoughupdates.commands.profile.ViewProfileCommand;
-import io.github.moulberry.notenoughupdates.commands.repo.ReloadRepoCommand;
-import io.github.moulberry.notenoughupdates.commands.repo.RepoModeCommand;
-import io.github.moulberry.notenoughupdates.commands.repo.ResetRepoCommand;
 import io.github.moulberry.notenoughupdates.miscfeatures.FairySouls;
 import io.github.moulberry.notenoughupdates.miscgui.GuiEnchantColour;
 import io.github.moulberry.notenoughupdates.miscgui.GuiInvButtonEditor;
@@ -41,11 +38,8 @@ public class Commands {
 		ClientCommandHandler.instance.registerCommand(new DevTestCommand());
 		ClientCommandHandler.instance.registerCommand(new NullzeeSphereCommand());
 		ClientCommandHandler.instance.registerCommand(new DiagCommand());
-
-		// Repo Commands
-		ClientCommandHandler.instance.registerCommand(new ResetRepoCommand());
-		ClientCommandHandler.instance.registerCommand(new RepoModeCommand());
 		ClientCommandHandler.instance.registerCommand(new ReloadRepoCommand());
+		ClientCommandHandler.instance.registerCommand(new ResetRepoCommand());
 
 		// Profile Commands
 		ClientCommandHandler.instance.registerCommand(new PeekCommand());
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/repo/ReloadRepoCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/ReloadRepoCommand.java
index 7e58088f..40db245a 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/repo/ReloadRepoCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/ReloadRepoCommand.java
@@ -1,15 +1,10 @@
-package io.github.moulberry.notenoughupdates.commands.repo;
+package io.github.moulberry.notenoughupdates.commands.dev;
 
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import io.github.moulberry.notenoughupdates.commands.ClientCommandBase;
-import io.github.moulberry.notenoughupdates.options.NEUConfig;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
+import net.minecraft.util.ChatComponentText;
 
 public class ReloadRepoCommand extends ClientCommandBase {
 
@@ -19,10 +14,7 @@ public class ReloadRepoCommand extends ClientCommandBase {
 
 	@Override
 	public void processCommand(ICommandSender sender, String[] args) throws CommandException {
-		if (args.length > 1 && args[0].equals("fetch")) {
-			NotEnoughUpdates.INSTANCE.manager.fetchRepository();
-		} else {
-			NotEnoughUpdates.INSTANCE.manager.reloadRepository();
-		}
+		NotEnoughUpdates.INSTANCE.manager.reloadRepository();
+		sender.addChatMessage(new ChatComponentText("§e[NEU] Reloaded repository."));
 	}
 }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/repo/ResetRepoCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/ResetRepoCommand.java
index b9a0d7cd..9e8363fb 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/repo/ResetRepoCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/ResetRepoCommand.java
@@ -1,9 +1,10 @@
-package io.github.moulberry.notenoughupdates.commands.repo;
+package io.github.moulberry.notenoughupdates.commands.dev;
 
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import io.github.moulberry.notenoughupdates.commands.ClientCommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
+import net.minecraft.util.ChatComponentText;
 
 public class ResetRepoCommand extends ClientCommandBase {
 
@@ -13,6 +14,10 @@ public class ResetRepoCommand extends ClientCommandBase {
 
 	@Override
 	public void processCommand(ICommandSender sender, String[] args) throws CommandException {
-		NotEnoughUpdates.INSTANCE.manager.resetRepo();
+		NotEnoughUpdates.INSTANCE.manager
+			.userFacingRepositoryReload()
+			.thenAccept(strings ->
+				strings.forEach(line ->
+					sender.addChatMessage(new ChatComponentText("§e[NEU] " + line))));
 	}
 }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/StatsCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/StatsCommand.java
index 38eafe39..c7b6e887 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/StatsCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/StatsCommand.java
@@ -146,7 +146,7 @@ public class StatsCommand extends ClientCommandBase {
 		builder.append("Loaded Mods", String.valueOf(activeModCount));
 		builder.append("Forge", ForgeVersion.getVersion());
 		builder.category("Neu Settings");
-		builder.append("API Key", NotEnoughUpdates.INSTANCE.config.apiKey.apiKey.isEmpty() ? "FALSE" : "TRUE");
+		builder.append("API Key", NotEnoughUpdates.INSTANCE.config.apiData.apiKey.isEmpty() ? "FALSE" : "TRUE");
 		builder.append("On Skyblock", NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard() ? "TRUE" : "FALSE");
 		builder.append(
 			"Mod Version",
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/misc/AhCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/misc/AhCommand.java
index 0b2c155e..69d114ca 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/misc/AhCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/misc/AhCommand.java
@@ -21,8 +21,8 @@ public class AhCommand extends ClientCommandBase {
 		if (!NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard()) {
 			Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.RED +
 				"You must be on Skyblock to use this feature."));
-		} else if (NotEnoughUpdates.INSTANCE.config.apiKey.apiKey == null ||
-			NotEnoughUpdates.INSTANCE.config.apiKey.apiKey.trim().isEmpty()) {
+		} else if (NotEnoughUpdates.INSTANCE.config.apiData.apiKey == null ||
+			NotEnoughUpdates.INSTANCE.config.apiData.apiKey.trim().isEmpty()) {
 			Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.RED +
 				"Can't open NeuAH, apikey is not set. Run /api new and put the result in settings."));
 		} else {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/profile/ViewProfileCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/profile/ViewProfileCommand.java
index 371db394..fe441ad6 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/profile/ViewProfileCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/profile/ViewProfileCommand.java
@@ -23,8 +23,8 @@ public class ViewProfileCommand extends ClientCommandBase {
 				"Some parts of the profile viewer do not work with OF Fast Render. Go to ESC > Options > Video Settings > Performance > Fast Render to disable it."));
 
 		}
-		if (NotEnoughUpdates.INSTANCE.config.apiKey.apiKey == null ||
-			NotEnoughUpdates.INSTANCE.config.apiKey.apiKey.trim().isEmpty()) {
+		if (NotEnoughUpdates.INSTANCE.config.apiData.apiKey == null ||
+			NotEnoughUpdates.INSTANCE.config.apiData.apiKey.trim().isEmpty()) {
 			Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.RED +
 				"Can't view profile, apikey is not set. Run /api new and put the result in settings."));
 		} else if (args.length == 0) {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/repo/RepoModeCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/repo/RepoModeCommand.java
deleted file mode 100644
index 7e5312fb..00000000
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/repo/RepoModeCommand.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.github.moulberry.notenoughupdates.commands.repo;
-
-import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
-import io.github.moulberry.notenoughupdates.commands.ClientCommandBase;
-import net.minecraft.client.Minecraft;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.event.ClickEvent;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.ChatStyle;
-
-public class RepoModeCommand extends ClientCommandBase {
-
-	public RepoModeCommand() {
-		super("neurepomode");
-	}
-
-	@Override
-	public void processCommand(ICommandSender sender, String[] args) throws CommandException {
-		if (args.length == 1 && args[0].equalsIgnoreCase("toggle")) {
-			NotEnoughUpdates.INSTANCE.config.hidden.dev = !NotEnoughUpdates.INSTANCE.config.hidden.dev;
-			NotEnoughUpdates.INSTANCE.config.hidden.enableItemEditing =
-				!NotEnoughUpdates.INSTANCE.config.hidden.enableItemEditing;
-			Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("\u00a75Toggled NEU repo dev mode."));
-		} else if (args.length >= 2 && args[0].equalsIgnoreCase("setrepourl")) {
-			String githubUser = "Moulberry";
-			String githubRepo = "NotEnoughUpdates-REPO";
-			String githubBranch = "master";
-			if (!args[1].equalsIgnoreCase("reset")) {
-				githubUser = args[1];
-				if (args.length >= 3) {
-					githubRepo = args[2];
-				}
-				if (args.length >= 4) {
-					githubBranch = args[3];
-				}
-			}
-			NotEnoughUpdates.INSTANCE.config.hidden.repoURL =
-				"https://github.com/" + githubUser + "/" + githubRepo + "/archive/" + githubBranch + ".zip";
-			NotEnoughUpdates.INSTANCE.config.hidden.repoCommitsURL =
-				"https://api.github.com/repos/" + githubUser + "/" + githubRepo + "/commits/" + githubBranch;
-			Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-				"\u00a75Set NEU repo URL to " + NotEnoughUpdates.INSTANCE.config.hidden.repoURL +
-					"\n\u00a75Set NEU repo commits URL to " + NotEnoughUpdates.INSTANCE.config.hidden.repoCommitsURL));
-			Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("\u00a75Run <")
-				.appendSibling(new ChatComponentText("/neureloadrepo fetch").setChatStyle(new ChatStyle().setChatClickEvent(new ClickEvent(
-					ClickEvent.Action.SUGGEST_COMMAND, "/neureloadrepo fetch"))))
-				.appendSibling(new ChatComponentText("\u00a75> to redownload your repo.")));
-
-		} else if (args.length == 1 && args[0].equalsIgnoreCase("autoupdate")) {
-			NotEnoughUpdates.INSTANCE.config.hidden.autoupdate = !NotEnoughUpdates.INSTANCE.config.hidden.autoupdate;
-			Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("\u00a75Toggled repo auto-updating" + (NotEnoughUpdates.INSTANCE.config.hidden.autoupdate ? "on" : "off")));
-		} else {
-			Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("\u00a7cUsage:" +
-				"\n\u00a75/neurepomode <toggle> Toggles on/off dev mode and item editing." +
-				"\n\u00a75/neurepomode <setRepoURL> <githubuser> [reponame] [branch] Sets the repo URL for downloading from." +
-				"\n\u00a75/neurepomode <autoupdate> Toggles on/off auto-updating the repo"));
-		}
-	}
-}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/listener/ChatListener.java b/src/main/java/io/github/moulberry/notenoughupdates/listener/ChatListener.java
index 6a5164a2..e4f0b3da 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/listener/ChatListener.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/listener/ChatListener.java
@@ -145,7 +145,7 @@ public class ChatListener {
 				.substring("Your profile was changed to: ".length())
 				.split(" ")[0].trim());
 		} else if (unformatted.startsWith("Your new API key is ")) {
-			NotEnoughUpdates.INSTANCE.config.apiKey.apiKey = unformatted.substring("Your new API key is ".length()).substring(
+			NotEnoughUpdates.INSTANCE.config.apiData.apiKey = unformatted.substring("Your new API key is ".length()).substring(
 				0,
 				36
 			);
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java b/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java
index 4823f5c5..fcba864c 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java
@@ -1390,7 +1390,7 @@ public class RenderListener {
 				event.setCanceled(true);
 			}
 		}
-		if (NotEnoughUpdates.INSTANCE.config.hidden.dev && NotEnoughUpdates.INSTANCE.config.hidden.enableItemEditing &&
+		if (NotEnoughUpdates.INSTANCE.config.apiData.repositoryEditing &&
 			Minecraft.getMinecraft().theWorld != null && Keyboard.getEventKey() == Keyboard.KEY_N &&
 			Keyboard.getEventKeyState()) {
 			GuiScreen gui = Minecraft.getMinecraft().currentScreen;
@@ -1447,7 +1447,7 @@ public class RenderListener {
 				System.out.println(essenceJson);
 			}
 		}
-		if (NotEnoughUpdates.INSTANCE.config.hidden.dev && NotEnoughUpdates.INSTANCE.config.hidden.enableItemEditing &&
+		if (NotEnoughUpdates.INSTANCE.config.apiData.repositoryEditing &&
 			Minecraft.getMinecraft().theWorld != null && Keyboard.getEventKey() == Keyboard.KEY_O &&
 			Keyboard.getEventKeyState()) {
 			GuiScreen gui = Minecraft.getMinecraft().currentScreen;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/EntityViewer.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/EntityViewer.java
index 130f6ee7..78d035ac 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/EntityViewer.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/EntityViewer.java
@@ -79,6 +79,7 @@ public class EntityViewer extends GuiScreen {
         put("invisible", new InvisibleModifier());
         put("age", new AgeModifier());
 				put("horse", new HorseModifier());
+				put("name", new NameModifier());
     }};
 
     public int guiLeft = 0;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/GUIClientPlayer.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/GUIClientPlayer.java
index bbff2db1..db20a684 100644
--- a/src/main/java/