removed warnings

This commit is contained in:
2025-03-26 15:17:10 +01:00
parent aa648190d3
commit 73fde40eb6
15 changed files with 20 additions and 31 deletions
@@ -35,7 +35,7 @@ public class SaturnClient implements ModInitializer {
ModManager.init(); ModManager.init();
ConfigManager.load(); ConfigManager.load();
ClientLifecycleEvents.CLIENT_STOPPING.register(c -> ConfigManager.save() ClientLifecycleEvents.CLIENT_STOPPING.register(_ -> ConfigManager.save()
); );
KeyInputHandler.register(); KeyInputHandler.register();
@@ -1,15 +1,16 @@
package org.saturnclient.saturnclient.auth; 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.io.*;
import java.net.Socket; import java.net.Socket;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; 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 { public class SaturnSocket {
private static final String server = "127.0.0.1"; private static final String server = "127.0.0.1";
private static final int port = 8080; private static final int port = 8080;
@@ -26,7 +27,7 @@ public class SaturnSocket {
@SuppressWarnings("resource") @SuppressWarnings("resource")
public static boolean authenticate() { public static boolean authenticate() {
// Register shutdown hook ONCE // Register shutdown hook ONCE
ClientLifecycleEvents.CLIENT_STOPPING.register(c -> close()); ClientLifecycleEvents.CLIENT_STOPPING.register(_ -> close());
try { try {
MinecraftClient client = MinecraftClient.getInstance(); MinecraftClient client = MinecraftClient.getInstance();
@@ -40,7 +41,9 @@ public class SaturnSocket {
// Establish a persistent connection // Establish a persistent connection
socket = new Socket(server, port); 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); writer = new PrintWriter(socket.getOutputStream(), true);
// Send authentication request // Send authentication request
@@ -62,8 +65,11 @@ public class SaturnSocket {
players.put(uuid, new SaturnPlayer(cloak)); players.put(uuid, new SaturnPlayer(cloak));
if (cloak != null) { if (cloak != null) {
SaturnClient.LOGGER.info("Setting cloak to " + cloak + " for " + uuid); SaturnClient.LOGGER.info(
MinecraftClient.getInstance().execute(() -> Cloaks.setCloak(uuid, cloak)); "Setting cloak to " + cloak + " for " + uuid
);
MinecraftClient.getInstance()
.execute(() -> Cloaks.setCloak(uuid, cloak));
} }
playerNames.put(client.getSession().getUsername(), uuid); playerNames.put(client.getSession().getUsername(), uuid);
@@ -72,7 +78,6 @@ public class SaturnSocket {
startListenerThread(); startListenerThread();
return true; return true;
} catch (IOException e) { } catch (IOException e) {
SaturnClient.LOGGER.error("Authentication failed", e); SaturnClient.LOGGER.error("Authentication failed", e);
return false; return false;
@@ -91,9 +96,6 @@ public class SaturnSocket {
} }
SaturnClient.LOGGER.info("Received: " + message); SaturnClient.LOGGER.info("Received: " + message);
// TODO: make a server response/request handler
} }
} catch (IOException e) { } catch (IOException e) {
SaturnClient.LOGGER.error("Error reading from server", e); SaturnClient.LOGGER.error("Error reading from server", e);
@@ -52,8 +52,6 @@ public class ConfigEditor extends SaturnUi {
.setAnimations(new Slide(1, 10)) .setAnimations(new Slide(1, 10))
); );
int propWidth = (rectWidth - 15) / 2;
SaturnScroll configScroll = new SaturnScroll(); SaturnScroll configScroll = new SaturnScroll();
int row = 0; int row = 0;
@@ -53,7 +53,7 @@ public class ModManager {
}; };
public static void init() { public static void init() {
HudRenderCallback.EVENT.register((context, tickDelta) -> { HudRenderCallback.EVENT.register((context, _) -> {
MinecraftClient client = MinecraftClient.getInstance(); MinecraftClient client = MinecraftClient.getInstance();
TextRenderer textRenderer = client.textRenderer; TextRenderer textRenderer = client.textRenderer;
@@ -3,7 +3,6 @@ package org.saturnclient.ui.components;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
import net.minecraft.util.math.ColorHelper;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.menus.ConfigEditor; import org.saturnclient.saturnclient.menus.ConfigEditor;
import org.saturnclient.saturnmods.SaturnMod; import org.saturnclient.saturnmods.SaturnMod;
@@ -2,7 +2,6 @@ package org.saturnclient.ui.components;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
import net.minecraft.util.math.ColorHelper;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.config.Property; import org.saturnclient.saturnclient.config.Property;
import org.saturnclient.ui.SaturnWidget; import org.saturnclient.ui.SaturnWidget;
@@ -5,7 +5,6 @@ import java.util.function.Consumer;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
import net.minecraft.util.math.ColorHelper;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
@@ -4,7 +4,6 @@ import java.util.function.Consumer;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.math.ColorHelper;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.ui.SaturnWidget; import org.saturnclient.ui.SaturnWidget;
@@ -26,7 +25,7 @@ public class SaturnClickableImage extends SaturnWidget {
} }
public SaturnClickableImage(Identifier texture, Runnable onPress) { public SaturnClickableImage(Identifier texture, Runnable onPress) {
this(texture, m -> { this(texture, _ -> {
onPress.run(); onPress.run();
}); });
} }
@@ -4,7 +4,6 @@ import java.util.function.Consumer;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.math.ColorHelper;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.ui.SaturnWidget; import org.saturnclient.ui.SaturnWidget;
@@ -26,7 +25,7 @@ public class SaturnClickableSprite extends SaturnWidget {
} }
public SaturnClickableSprite(Identifier sprite, Runnable onPress) { public SaturnClickableSprite(Identifier sprite, Runnable onPress) {
this(sprite, m -> { this(sprite, _ -> {
onPress.run(); onPress.run();
}); });
} }
@@ -4,7 +4,6 @@ import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.math.ColorHelper; import net.minecraft.util.math.ColorHelper;
import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.ui.SaturnWidget; import org.saturnclient.ui.SaturnWidget;
public class SaturnImage extends SaturnWidget { public class SaturnImage extends SaturnWidget {
@@ -4,7 +4,6 @@ import java.util.function.Consumer;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.math.ColorHelper;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
public class SaturnImageButton extends SaturnButton { public class SaturnImageButton extends SaturnButton {
@@ -20,7 +19,7 @@ public class SaturnImageButton extends SaturnButton {
int imageHeight, int imageHeight,
Consumer<SaturnImageButton> onPress Consumer<SaturnImageButton> onPress
) { ) {
super("", b -> {}); super("", _ -> {});
this.sprite = sprite; this.sprite = sprite;
this.imageWidth = imageWidth; this.imageWidth = imageWidth;
this.imageHeight = imageHeight; this.imageHeight = imageHeight;
@@ -33,7 +32,7 @@ public class SaturnImageButton extends SaturnButton {
int imageHeight, int imageHeight,
Runnable onPress Runnable onPress
) { ) {
this(sprite, imageWidth, imageHeight, b -> { this(sprite, imageWidth, imageHeight, _ -> {
onPress.run(); onPress.run();
}); });
} }
@@ -4,7 +4,6 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer; import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
import net.minecraft.util.math.ColorHelper;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.ui.SaturnUi; import org.saturnclient.ui.SaturnUi;
@@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.network.packet.s2c.custom.DebugRedstoneUpdateOrderCustomPayload.Wire;
import org.saturnclient.ui.SaturnWidget; import org.saturnclient.ui.SaturnWidget;
public class SaturnScroll extends SaturnWidget { public class SaturnScroll extends SaturnWidget {
@@ -4,7 +4,6 @@ import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.math.ColorHelper; import net.minecraft.util.math.ColorHelper;
import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.ui.SaturnWidget; import org.saturnclient.ui.SaturnWidget;
public class SaturnSprite extends SaturnWidget { public class SaturnSprite extends SaturnWidget {
@@ -1,7 +1,6 @@
package org.saturnclient.ui.widgets; package org.saturnclient.ui.widgets;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.util.math.ColorHelper;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.ui.SaturnUi; import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.SaturnWidget; import org.saturnclient.ui.SaturnWidget;