From 5a354b562f5233440cb0a00d9ce441d139b26d07 Mon Sep 17 00:00:00 2001
From: jani270 <69345714+jani270@users.noreply.github.com>
Date: Fri, 4 Nov 2022 17:35:54 +0100
Subject: Removed prerelease option, set prerelease branch as default (#420)

---
 .../java/io/github/moulberry/notenoughupdates/NEUManager.java     | 2 +-
 .../io/github/moulberry/notenoughupdates/NotEnoughUpdates.java    | 7 ++++++-
 .../io/github/moulberry/notenoughupdates/options/NEUConfig.java   | 7 -------
 .../notenoughupdates/options/seperateSections/ApiData.java        | 8 --------
 4 files changed, 7 insertions(+), 17 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
index a30ca08a..ca0d91d2 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
@@ -1585,7 +1585,7 @@ public class NEUManager {
 					"§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).",
+					"§c(or by not using the prerelease 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."
 				);
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
index 45efe151..726acb32 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
@@ -273,7 +273,12 @@ public class NotEnoughUpdates {
 
 			// Remove after 2.1 ig
 			if ("dangerous".equals(config.apiData.repoBranch)) {
-				config.apiData.repoBranch = "master";
+				config.apiData.repoBranch = "prerelease";
+			}
+
+			// Remove before 2.1.1 release
+			if ("master".equals(config.apiData.repoBranch)) {
+				config.apiData.repoBranch = "prerelease";
 			}
 
 			saveConfig();
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
index 9c4343cb..adbd52f1 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
@@ -161,13 +161,6 @@ public class NEUConfig extends Config {
 				NotEnoughUpdates.INSTANCE.openGui =
 					new GuiScreenElementWrapper(new NEUConfigEditor(NotEnoughUpdates.INSTANCE.config, "apis"));
 				return;
-			case 24:
-				NotEnoughUpdates.INSTANCE.config.apiData.repoUser = "NotEnoughUpdates";
-				NotEnoughUpdates.INSTANCE.config.apiData.repoName = "NotEnoughUpdates-REPO";
-				NotEnoughUpdates.INSTANCE.config.apiData.repoBranch = "dangerous";
-				NotEnoughUpdates.INSTANCE.openGui =
-					new GuiScreenElementWrapper(new NEUConfigEditor(NotEnoughUpdates.INSTANCE.config, "apis"));
-				return;
 			case 26:
 				OverlayManager.powderGrindingOverlay.reset();
 				return;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ApiData.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ApiData.java
index 9802af89..63faf940 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ApiData.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ApiData.java
@@ -74,14 +74,6 @@ public class ApiData {
 	@ConfigEditorButton(runnableId = 23, buttonText = "Reset")
 	public int setRepositoryToDefaultButton = 0;
 
-	@ConfigAccordionId(id = 1)
-	@ConfigOption(
-		name = "Use pre-release repository",
-		desc = "The latest, most up to date item list for the NEU pre-releases.\n§4Use §lonly§r§4 with the pre-releases."
-	)
-	@ConfigEditorButton(runnableId = 24, buttonText = "Use")
-	public int setRepositoryToDangerousButton = 0;
-
 	@Expose
 	@ConfigAccordionId(id = 1)
 	@ConfigOption(
-- 
cgit