From 73fde40eb639d9110cacaf2c04c3e7017692b160 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Wed, 26 Mar 2025 15:17:10 +0100 Subject: [PATCH] removed warnings --- .../saturnclient/SaturnClient.java | 2 +- .../saturnclient/auth/SaturnSocket.java | 26 ++++++++++--------- .../saturnclient/menus/ConfigEditor.java | 2 -- .../saturnclient/saturnmods/ModManager.java | 2 +- .../ui/components/SaturnModComp.java | 1 - .../ui/components/SaturnToggle.java | 1 - .../saturnclient/ui/widgets/SaturnButton.java | 1 - .../ui/widgets/SaturnClickableImage.java | 3 +-- .../ui/widgets/SaturnClickableSprite.java | 3 +-- .../saturnclient/ui/widgets/SaturnImage.java | 1 - .../ui/widgets/SaturnImageButton.java | 5 ++-- .../ui/widgets/SaturnInputBox.java | 1 - .../saturnclient/ui/widgets/SaturnScroll.java | 1 - .../saturnclient/ui/widgets/SaturnSprite.java | 1 - .../saturnclient/ui/widgets/SaturnText.java | 1 - 15 files changed, 20 insertions(+), 31 deletions(-) diff --git a/src/main/java/org/saturnclient/saturnclient/SaturnClient.java b/src/main/java/org/saturnclient/saturnclient/SaturnClient.java index 9a216d6..8eb0a66 100644 --- a/src/main/java/org/saturnclient/saturnclient/SaturnClient.java +++ b/src/main/java/org/saturnclient/saturnclient/SaturnClient.java @@ -35,7 +35,7 @@ public class SaturnClient implements ModInitializer { ModManager.init(); ConfigManager.load(); - ClientLifecycleEvents.CLIENT_STOPPING.register(c -> ConfigManager.save() + ClientLifecycleEvents.CLIENT_STOPPING.register(_ -> ConfigManager.save() ); KeyInputHandler.register(); diff --git a/src/main/java/org/saturnclient/saturnclient/auth/SaturnSocket.java b/src/main/java/org/saturnclient/saturnclient/auth/SaturnSocket.java index a9be6ed..8b09b79 100644 --- a/src/main/java/org/saturnclient/saturnclient/auth/SaturnSocket.java +++ b/src/main/java/org/saturnclient/saturnclient/auth/SaturnSocket.java @@ -1,15 +1,16 @@ package org.saturnclient.saturnclient.auth; -import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents; -import net.minecraft.client.MinecraftClient; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.cloaks.Cloaks; import java.io.*; import java.net.Socket; import java.util.HashMap; import java.util.Map; +import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents; +import net.minecraft.client.MinecraftClient; +import org.saturnclient.saturnclient.SaturnClient; +import org.saturnclient.saturnclient.cloaks.Cloaks; public class SaturnSocket { + private static final String server = "127.0.0.1"; private static final int port = 8080; @@ -26,7 +27,7 @@ public class SaturnSocket { @SuppressWarnings("resource") public static boolean authenticate() { // Register shutdown hook ONCE - ClientLifecycleEvents.CLIENT_STOPPING.register(c -> close()); + ClientLifecycleEvents.CLIENT_STOPPING.register(_ -> close()); try { MinecraftClient client = MinecraftClient.getInstance(); @@ -40,7 +41,9 @@ public class SaturnSocket { // Establish a persistent connection socket = new Socket(server, port); - reader = new BufferedReader(new InputStreamReader(socket.getInputStream())); + reader = new BufferedReader( + new InputStreamReader(socket.getInputStream()) + ); writer = new PrintWriter(socket.getOutputStream(), true); // Send authentication request @@ -62,8 +65,11 @@ public class SaturnSocket { players.put(uuid, new SaturnPlayer(cloak)); if (cloak != null) { - SaturnClient.LOGGER.info("Setting cloak to " + cloak + " for " + uuid); - MinecraftClient.getInstance().execute(() -> Cloaks.setCloak(uuid, cloak)); + SaturnClient.LOGGER.info( + "Setting cloak to " + cloak + " for " + uuid + ); + MinecraftClient.getInstance() + .execute(() -> Cloaks.setCloak(uuid, cloak)); } playerNames.put(client.getSession().getUsername(), uuid); @@ -72,7 +78,6 @@ public class SaturnSocket { startListenerThread(); return true; - } catch (IOException e) { SaturnClient.LOGGER.error("Authentication failed", e); return false; @@ -91,9 +96,6 @@ public class SaturnSocket { } SaturnClient.LOGGER.info("Received: " + message); - - // TODO: make a server response/request handler - } } catch (IOException e) { SaturnClient.LOGGER.error("Error reading from server", e); diff --git a/src/main/java/org/saturnclient/saturnclient/menus/ConfigEditor.java b/src/main/java/org/saturnclient/saturnclient/menus/ConfigEditor.java index 5083e42..ce181fb 100644 --- a/src/main/java/org/saturnclient/saturnclient/menus/ConfigEditor.java +++ b/src/main/java/org/saturnclient/saturnclient/menus/ConfigEditor.java @@ -52,8 +52,6 @@ public class ConfigEditor extends SaturnUi { .setAnimations(new Slide(1, 10)) ); - int propWidth = (rectWidth - 15) / 2; - SaturnScroll configScroll = new SaturnScroll(); int row = 0; diff --git a/src/main/java/org/saturnclient/saturnmods/ModManager.java b/src/main/java/org/saturnclient/saturnmods/ModManager.java index 7eb5e67..16264c1 100644 --- a/src/main/java/org/saturnclient/saturnmods/ModManager.java +++ b/src/main/java/org/saturnclient/saturnmods/ModManager.java @@ -53,7 +53,7 @@ public class ModManager { }; public static void init() { - HudRenderCallback.EVENT.register((context, tickDelta) -> { + HudRenderCallback.EVENT.register((context, _) -> { MinecraftClient client = MinecraftClient.getInstance(); TextRenderer textRenderer = client.textRenderer; diff --git a/src/main/java/org/saturnclient/ui/components/SaturnModComp.java b/src/main/java/org/saturnclient/ui/components/SaturnModComp.java index ffe5643..ca14cd8 100644 --- a/src/main/java/org/saturnclient/ui/components/SaturnModComp.java +++ b/src/main/java/org/saturnclient/ui/components/SaturnModComp.java @@ -3,7 +3,6 @@ package org.saturnclient.ui.components; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.RenderLayer; -import net.minecraft.util.math.ColorHelper; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.menus.ConfigEditor; import org.saturnclient.saturnmods.SaturnMod; diff --git a/src/main/java/org/saturnclient/ui/components/SaturnToggle.java b/src/main/java/org/saturnclient/ui/components/SaturnToggle.java index 8f311b5..08cfa88 100644 --- a/src/main/java/org/saturnclient/ui/components/SaturnToggle.java +++ b/src/main/java/org/saturnclient/ui/components/SaturnToggle.java @@ -2,7 +2,6 @@ package org.saturnclient.ui.components; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.RenderLayer; -import net.minecraft.util.math.ColorHelper; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.config.Property; import org.saturnclient.ui.SaturnWidget; diff --git a/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java b/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java index e18e26a..38b284b 100644 --- a/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java +++ b/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java @@ -5,7 +5,6 @@ import java.util.function.Consumer; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.RenderLayer; -import net.minecraft.util.math.ColorHelper; import net.minecraft.util.math.MathHelper; import org.lwjgl.opengl.GL11; import org.saturnclient.saturnclient.SaturnClient; diff --git a/src/main/java/org/saturnclient/ui/widgets/SaturnClickableImage.java b/src/main/java/org/saturnclient/ui/widgets/SaturnClickableImage.java index 438e36b..4666f67 100644 --- a/src/main/java/org/saturnclient/ui/widgets/SaturnClickableImage.java +++ b/src/main/java/org/saturnclient/ui/widgets/SaturnClickableImage.java @@ -4,7 +4,6 @@ import java.util.function.Consumer; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.RenderLayer; import net.minecraft.util.Identifier; -import net.minecraft.util.math.ColorHelper; import net.minecraft.util.math.MathHelper; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.ui.SaturnWidget; @@ -26,7 +25,7 @@ public class SaturnClickableImage extends SaturnWidget { } public SaturnClickableImage(Identifier texture, Runnable onPress) { - this(texture, m -> { + this(texture, _ -> { onPress.run(); }); } diff --git a/src/main/java/org/saturnclient/ui/widgets/SaturnClickableSprite.java b/src/main/java/org/saturnclient/ui/widgets/SaturnClickableSprite.java index 01a2a08..cf3138f 100644 --- a/src/main/java/org/saturnclient/ui/widgets/SaturnClickableSprite.java +++ b/src/main/java/org/saturnclient/ui/widgets/SaturnClickableSprite.java @@ -4,7 +4,6 @@ import java.util.function.Consumer; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.RenderLayer; import net.minecraft.util.Identifier; -import net.minecraft.util.math.ColorHelper; import net.minecraft.util.math.MathHelper; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.ui.SaturnWidget; @@ -26,7 +25,7 @@ public class SaturnClickableSprite extends SaturnWidget { } public SaturnClickableSprite(Identifier sprite, Runnable onPress) { - this(sprite, m -> { + this(sprite, _ -> { onPress.run(); }); } diff --git a/src/main/java/org/saturnclient/ui/widgets/SaturnImage.java b/src/main/java/org/saturnclient/ui/widgets/SaturnImage.java index 24504e9..28c64f5 100644 --- a/src/main/java/org/saturnclient/ui/widgets/SaturnImage.java +++ b/src/main/java/org/saturnclient/ui/widgets/SaturnImage.java @@ -4,7 +4,6 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.RenderLayer; import net.minecraft.util.Identifier; import net.minecraft.util.math.ColorHelper; -import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.ui.SaturnWidget; public class SaturnImage extends SaturnWidget { diff --git a/src/main/java/org/saturnclient/ui/widgets/SaturnImageButton.java b/src/main/java/org/saturnclient/ui/widgets/SaturnImageButton.java index 69a2175..91c533a 100644 --- a/src/main/java/org/saturnclient/ui/widgets/SaturnImageButton.java +++ b/src/main/java/org/saturnclient/ui/widgets/SaturnImageButton.java @@ -4,7 +4,6 @@ import java.util.function.Consumer; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.RenderLayer; import net.minecraft.util.Identifier; -import net.minecraft.util.math.ColorHelper; import org.saturnclient.saturnclient.SaturnClient; public class SaturnImageButton extends SaturnButton { @@ -20,7 +19,7 @@ public class SaturnImageButton extends SaturnButton { int imageHeight, Consumer onPress ) { - super("", b -> {}); + super("", _ -> {}); this.sprite = sprite; this.imageWidth = imageWidth; this.imageHeight = imageHeight; @@ -33,7 +32,7 @@ public class SaturnImageButton extends SaturnButton { int imageHeight, Runnable onPress ) { - this(sprite, imageWidth, imageHeight, b -> { + this(sprite, imageWidth, imageHeight, _ -> { onPress.run(); }); } diff --git a/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java b/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java index 40c767e..324134a 100644 --- a/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java +++ b/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java @@ -4,7 +4,6 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.RenderLayer; -import net.minecraft.util.math.ColorHelper; import org.lwjgl.glfw.GLFW; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.ui.SaturnUi; diff --git a/src/main/java/org/saturnclient/ui/widgets/SaturnScroll.java b/src/main/java/org/saturnclient/ui/widgets/SaturnScroll.java index 99616b2..8d3003d 100644 --- a/src/main/java/org/saturnclient/ui/widgets/SaturnScroll.java +++ b/src/main/java/org/saturnclient/ui/widgets/SaturnScroll.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.network.packet.s2c.custom.DebugRedstoneUpdateOrderCustomPayload.Wire; import org.saturnclient.ui.SaturnWidget; public class SaturnScroll extends SaturnWidget { diff --git a/src/main/java/org/saturnclient/ui/widgets/SaturnSprite.java b/src/main/java/org/saturnclient/ui/widgets/SaturnSprite.java index 6a40f4b..3f33fe7 100644 --- a/src/main/java/org/saturnclient/ui/widgets/SaturnSprite.java +++ b/src/main/java/org/saturnclient/ui/widgets/SaturnSprite.java @@ -4,7 +4,6 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.RenderLayer; import net.minecraft.util.Identifier; import net.minecraft.util.math.ColorHelper; -import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.ui.SaturnWidget; public class SaturnSprite extends SaturnWidget { diff --git a/src/main/java/org/saturnclient/ui/widgets/SaturnText.java b/src/main/java/org/saturnclient/ui/widgets/SaturnText.java index b85a0da..150fccf 100644 --- a/src/main/java/org/saturnclient/ui/widgets/SaturnText.java +++ b/src/main/java/org/saturnclient/ui/widgets/SaturnText.java @@ -1,7 +1,6 @@ package org.saturnclient.ui.widgets; import net.minecraft.client.gui.DrawContext; -import net.minecraft.util.math.ColorHelper; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.ui.SaturnUi; import org.saturnclient.ui.SaturnWidget;