Clean up code after rebase

SkyblockerMod · Jul 1, 2024 · 411a62d · 411a62d
1 parent 3856ba8
commit 411a62d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/src/main/java/de/hysky/skyblocker/utils/Http.java b/src/main/java/de/hysky/skyblocker/utils/Http.java
@@ -66,9 +66,8 @@ public static InputStream downloadContent(String url) throws IOException, Interr
 				.build();
 
 		HttpResponse<InputStream> response = HTTP_CLIENT.send(request, BodyHandlers.ofInputStream());
-		InputStream decodedInputStream = getDecodedInputStream(response);
 
-		return decodedInputStream;
+		return getDecodedInputStream(response);
 	}
 
 	public static String sendGetRequest(String url) throws IOException, InterruptedException {
@@ -125,16 +124,12 @@ private static InputStream getDecodedInputStream(HttpResponse<InputStream> respo
 		String encoding = getContentEncoding(response.headers());
 
 		try {
-			switch (encoding) {
-				case "":
-					return response.body();
-				case "gzip":
-					return new GZIPInputStream(response.body());
-				case "deflate":
-					return new InflaterInputStream(response.body());
-				default:
-					throw new UnsupportedOperationException("The server sent content in an unexpected encoding: " + encoding);
-			}
+			return switch (encoding) {
+				case "" -> response.body();
+				case "gzip" -> new GZIPInputStream(response.body());
+				case "deflate" -> new InflaterInputStream(response.body());
+				default -> throw new UnsupportedOperationException("The server sent content in an unexpected encoding: " + encoding);
+			};
 		} catch (IOException e) {
 			throw new UncheckedIOException(e);
 		}

diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java
@@ -495,7 +495,7 @@ private static void scheduleMayorTick() {
 	private static void tickMayorCache() {
 		CompletableFuture.supplyAsync(() -> {
 			try {
-				Http.ApiResponse response = Http.sendCacheableGetRequest("https://api.hypixel.net/v2/resources/skyblock/election");
+				Http.ApiResponse response = Http.sendCacheableGetRequest("https://api.hypixel.net/v2/resources/skyblock/election", null); //Authentication is not required for this endpoint
 				if (!response.ok()) throw new HttpResponseException(response.statusCode(), response.content());
 				JsonObject json = JsonParser.parseString(response.content()).getAsJsonObject();
 				if (!json.get("success").getAsBoolean()) throw new RuntimeException("Request failed!"); //Can't find a more appropriate exception to throw here.