Merge pull request #396 from msg-programs/cleanup-2

More cleanup

8 files changed, 42 insertions, 43 deletions

diff --git a/src/main/java/de/hysky/skyblocker/utils/ApiUtils.java b/src/main/java/de/hysky/skyblocker/utils/ApiUtils.java
index c0648eba..0121f8ad 100644
--- a/src/main/java/de/hysky/skyblocker/utils/ApiUtils.java
+++ b/src/main/java/de/hysky/skyblocker/utils/ApiUtils.java
@@ -21,33 +21,33 @@ public class ApiUtils {
 	 * Do not iterate over this map, it will be accessed and modified by multiple threads.
 	 */
 	private static final Object2ObjectOpenHashMap<String, String> NAME_2_UUID_CACHE = new Object2ObjectOpenHashMap<>();
-	
+
 	public static void init() {
 		//Clear cache every 20 minutes
 		Scheduler.INSTANCE.scheduleCyclic(NAME_2_UUID_CACHE::clear, 24_000, true);
 	}
-	
+
 	/**
 	 * Multithreading is to be handled by the method caller
 	 */
 	public static String name2Uuid(String name) {
 		Session session = MinecraftClient.getInstance().getSession();
-		
+
 		if (session.getUsername().equals(name)) return UndashedUuid.toString(session.getUuidOrNull());
 		if (NAME_2_UUID_CACHE.containsKey(name)) return NAME_2_UUID_CACHE.get(name);
-		
+
 		try (ApiResponse response = Http.sendName2UuidRequest(name)) {
 			if (response.ok()) {
 				String uuid = JsonParser.parseString(response.content()).getAsJsonObject().get("id").getAsString();
-				
+
 				NAME_2_UUID_CACHE.put(name, uuid);
-				
+
 				return uuid;
 			}
 		} catch (Exception e) {
 			LOGGER.error("[Skyblocker] Name to uuid lookup failed! Name: {}", name, e);
 		}
-		
+
 		return "";
 	}
 }
diff --git a/src/main/java/de/hysky/skyblocker/utils/Http.java b/src/main/java/de/hysky/skyblocker/utils/Http.java
index 573c3458..82ab6c5e 100644
--- a/src/main/java/de/hysky/skyblocker/utils/Http.java
+++ b/src/main/java/de/hysky/skyblocker/utils/Http.java
@@ -32,11 +32,11 @@ public class Http {
 			.connectTimeout(Duration.ofSeconds(10))
 			.followRedirects(Redirect.NORMAL)
 			.build();
-	
+
 	public static String sendGetRequest(String url) throws IOException, InterruptedException {
 		return sendCacheableGetRequest(url).content();
 	}
-	
+
 	private static ApiResponse sendCacheableGetRequest(String url) throws IOException, InterruptedException {
 		HttpRequest request = HttpRequest.newBuilder()
 				.GET()
@@ -46,16 +46,16 @@ public class Http {
 				.version(Version.HTTP_2)
 				.uri(URI.create(url))
 				.build();
-		
+
 		HttpResponse<InputStream> response = HTTP_CLIENT.send(request, BodyHandlers.ofInputStream());
 		InputStream decodedInputStream = getDecodedInputStream(response);
-		
+
 		String body = new String(decodedInputStream.readAllBytes());
 		HttpHeaders headers = response.headers();
-		
+
 		return new ApiResponse(body, response.statusCode(), getCacheStatus(headers), getAge(headers));
 	}
-	
+
 	public static HttpHeaders sendHeadRequest(String url) throws IOException, InterruptedException {
 		HttpRequest request = HttpRequest.newBuilder()
 				.method("HEAD", BodyPublishers.noBody())
@@ -63,15 +63,15 @@ public class Http {
 				.version(Version.HTTP_2)
 				.uri(URI.create(url))
 				.build();
-		
-		HttpResponse<Void> response = HTTP_CLIENT.send(request, BodyHandlers.discarding());		
+
+		HttpResponse<Void> response = HTTP_CLIENT.send(request, BodyHandlers.discarding());
 		return response.headers();
 	}
-	
+
 	public static ApiResponse sendName2UuidRequest(String name) throws IOException, InterruptedException {
 		return sendCacheableGetRequest(NAME_2_UUID + name);
 	}
-	
+
 	/**
 	 * @param endpoint the endpoint - do not include any leading or trailing slashes
 	 * @param query the query string - use empty string if n/a
@@ -80,10 +80,10 @@ public class Http {
 	public static ApiResponse sendHypixelRequest(String endpoint, @NotNull String query) throws IOException, InterruptedException {
 		return sendCacheableGetRequest(HYPIXEL_PROXY + endpoint + query);
 	}
-	
+
 	private static InputStream getDecodedInputStream(HttpResponse<InputStream> response) {
 		String encoding = getContentEncoding(response.headers());
-		
+
 		try {
 			switch (encoding) {
 				case "":
@@ -99,19 +99,19 @@ public class Http {
 			throw new UncheckedIOException(e);
 		}
 	}
-	
+
 	private static String getContentEncoding(HttpHeaders headers) {
 		return headers.firstValue("Content-Encoding").orElse("");
 	}
-	
+
 	public static String getEtag(HttpHeaders headers) {
 		return headers.firstValue("Etag").orElse("");
 	}
-	
+
 	public static String getLastModified(HttpHeaders headers) {
 		return headers.firstValue("Last-Modified").orElse("");
 	}
-	
+
 	/**
 	 * Returns the cache status of the resource
 	 * 
@@ -120,18 +120,18 @@ public class Http {
 	private static String getCacheStatus(HttpHeaders headers) {
 		return headers.firstValue("CF-Cache-Status").orElse("UNKNOWN");
 	}
-	
+
 	private static int getAge(HttpHeaders headers) {
 		return Integer.parseInt(headers.firstValue("Age").orElse("-1"));
 	}
-	
+
 	//TODO If ever needed, we could just replace cache status with the response headers and go from there
 	public record ApiResponse(String content, int statusCode, String cacheStatus, int age) implements AutoCloseable {
-		
+
 		public boolean ok() {
 			return statusCode == 200;
 		}
-		
+
 		public boolean cached() {
 			return cacheStatus.equals("HIT");
 		}
diff --git a/src/main/java/de/hysky/skyblocker/utils/SlayerUtils.java b/src/main/java/de/hysky/skyblocker/utils/SlayerUtils.java
index 0a42c6ae..2edd61f1 100644
--- a/src/main/java/de/hysky/skyblocker/utils/SlayerUtils.java
+++ b/src/main/java/de/hysky/skyblocker/utils/SlayerUtils.java
@@ -42,13 +42,13 @@ public class SlayerUtils {
         try {
             for (int i = 0; i < Utils.STRING_SCOREBOARD.size(); i++) {
                 String line = Utils.STRING_SCOREBOARD.get(i);
-                
+
                 if (line.contains("Slay the boss!")) return true;
             }
         } catch (NullPointerException e) {
             LOGGER.error("[Skyblocker] Error while checking if player is in slayer", e);
         }
-        
+
         return false;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java
index 71e08865..02b1637b 100644
--- a/src/main/java/de/hysky/skyblocker/utils/Utils.java
+++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java
@@ -363,7 +363,7 @@ public class Utils {
 
         if (isOnSkyblock && message.startsWith("Profile ID: ")) {
             profileId = message.replace("Profile ID: ", "");
-            
+
             MuseumItemCache.tick(profileId);
         }
 
diff --git a/src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java b/src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java
index 7892445e..2c75ef0a 100644
--- a/src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java
+++ b/src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java
@@ -9,7 +9,6 @@ import de.hysky.skyblocker.skyblock.dungeon.ThreeWeirdos;
 import de.hysky.skyblocker.skyblock.dungeon.Trivia;
 import de.hysky.skyblocker.skyblock.dwarven.Fetchur;
 import de.hysky.skyblocker.skyblock.dwarven.Puzzler;
-import de.hysky.skyblocker.skyblock.filters.*;
 import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
diff --git a/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java b/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java
index 064b564c..e4cfea1b 100644
--- a/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java
+++ b/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java
@@ -42,16 +42,16 @@ public class RenderHelper {
             renderFilled(context, Vec3d.of(pos), ONE, colorComponents, alpha, false);
         }
     }
-    
+
     private static void renderFilled(WorldRenderContext context, Vec3d pos, Vec3d dimensions, float[] colorComponents, float alpha, boolean throughWalls) {
         MatrixStack matrices = context.matrixStack();
         Vec3d camera = context.camera().getPos();
         Tessellator tessellator = RenderSystem.renderThreadTesselator();
         BufferBuilder buffer = tessellator.getBuffer();
-        
+
         matrices.push();
         matrices.translate(-camera.x, -camera.y, -camera.z);
-        
+
         RenderSystem.setShader(GameRenderer::getPositionColorProgram);
         RenderSystem.setShaderColor(1f, 1f, 1f, 1f);
         RenderSystem.polygonOffset(-1f, -10f);
@@ -61,11 +61,11 @@ public class RenderHelper {
         RenderSystem.enableDepthTest();
         RenderSystem.depthFunc(throughWalls ? GL11.GL_ALWAYS : GL11.GL_LEQUAL);
         RenderSystem.disableCull();
-        
+
         buffer.begin(DrawMode.TRIANGLE_STRIP, VertexFormats.POSITION_COLOR);
         WorldRenderer.renderFilledBox(matrices, buffer, pos.x, pos.y, pos.z, pos.x + dimensions.x, pos.y + dimensions.y, pos.z + dimensions.z, colorComponents[0], colorComponents[1], colorComponents[2], alpha);
         tessellator.draw();
-        
+
         matrices.pop();
         RenderSystem.polygonOffset(0f, 0f);
         RenderSystem.disablePolygonOffset();
diff --git a/src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java b/src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java
index 19d41c91..cc80f74c 100644
--- a/src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java
@@ -27,7 +27,7 @@ public class TitleContainerConfigScreen extends Screen {
     private float hudY = SkyblockerConfigManager.get().general.titleContainer.y;
     private final Screen parent;
     private boolean changedScale;
-    
+
     protected TitleContainerConfigScreen() {
     	this(null);
     }
@@ -173,18 +173,18 @@ public class TitleContainerConfigScreen extends Screen {
     public void close() {
         SkyblockerConfigManager.get().general.titleContainer.x = (int) hudX;
         SkyblockerConfigManager.get().general.titleContainer.y = (int) hudY;
-        
+
         //TODO Come up with a better, less hacky solution for this in the future (:
         if (parent instanceof YACLScreen yaclScreen) {
             ConfigCategory category = yaclScreen.config.categories().stream().filter(cat -> cat.name().getString().equals(I18n.translate("text.autoconfig.skyblocker.category.general"))).findFirst().orElseThrow();
             OptionGroup group = category.groups().stream().filter(grp -> grp.name().getString().equals(I18n.translate("text.autoconfig.skyblocker.option.general.titleContainer"))).findFirst().orElseThrow();
-                    	
+
             Option<?> scaleOpt = group.options().get(0);
-        	
+
             // Refresh the value in the config with the bound value
             if (changedScale) scaleOpt.forgetPendingValue();
         }
-        
+
         SkyblockerConfigManager.save();
         this.client.setScreen(parent);
     }
diff --git a/src/main/java/de/hysky/skyblocker/utils/scheduler/Scheduler.java b/src/main/java/de/hysky/skyblocker/utils/scheduler/Scheduler.java
index b254f524..139ac05e 100644
--- a/src/main/java/de/hysky/skyblocker/utils/scheduler/Scheduler.java
+++ b/src/main/java/de/hysky/skyblocker/utils/scheduler/Scheduler.java
@@ -28,14 +28,14 @@ public class Scheduler {
 
     protected Scheduler() {
     }
-    
+
     /**
      * @see #schedule(Runnable, int, boolean)
      */
     public void schedule(Runnable task, int delay) {
         schedule(task, delay, false);
     }
-    
+
     /**
      * @see #scheduleCyclic(Runnable, int, boolean)
      */