From ab8797dd76a445447a35add1a30aebf1b846b9cc Mon Sep 17 00:00:00 2001 From: Patrick <147879351+WinniePatGG@users.noreply.github.com> Date: Sat, 11 Jul 2026 20:30:17 +0200 Subject: [PATCH] Cleanup --- .../java/de/fullrisk/citrusDev/Config.java | 4 +- .../fullrisk/citrusDev/UI/Module_Coords.java | 1 - .../de/fullrisk/citrusDev/UI/Module_FPS.java | 1 - .../citrusDev/UI/Module_KeyStrokes.java | 10 +-- .../fullrisk/citrusDev/UI/OverviewScreen.java | 23 ------ .../de/fullrisk/citrusDev/UI/QuestsPanel.java | 3 - .../citrusDev/UIHelper/CitrusToast.java | 1 - .../citrusDev/UIHelper/ModuleRow.java | 1 - .../citrusDev/UIHelper/SettingsControls.java | 1 - .../citrusDev/client/CitrusDevClient.java | 4 +- .../citrusDev/client/PlaytimeTracker.java | 78 +++---------------- .../fullrisk/citrusDev/client/Verifier.java | 4 +- .../citrusDev/mixin/SliderComponentMixin.java | 2 - 13 files changed, 20 insertions(+), 113 deletions(-) delete mode 100644 src/main/java/de/fullrisk/citrusDev/UI/OverviewScreen.java diff --git a/src/main/java/de/fullrisk/citrusDev/Config.java b/src/main/java/de/fullrisk/citrusDev/Config.java index 3ec1a1b..89a000c 100644 --- a/src/main/java/de/fullrisk/citrusDev/Config.java +++ b/src/main/java/de/fullrisk/citrusDev/Config.java @@ -30,9 +30,7 @@ public class Config { public boolean coordsEnabled = true; private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - private static final Path PATH = FabricLoader.getInstance() - .getConfigDir() - .resolve("citrus-dev.json"); + private static final Path PATH = FabricLoader.getInstance().getConfigDir().resolve("citrus-dev.json"); private static Config instance; public int fpsP = 4; diff --git a/src/main/java/de/fullrisk/citrusDev/UI/Module_Coords.java b/src/main/java/de/fullrisk/citrusDev/UI/Module_Coords.java index 8718bde..135687e 100644 --- a/src/main/java/de/fullrisk/citrusDev/UI/Module_Coords.java +++ b/src/main/java/de/fullrisk/citrusDev/UI/Module_Coords.java @@ -22,7 +22,6 @@ public class Module_Coords { private static final Config CONFIG = Config.get(); - // Loaded from Config instead of hardcoded, so the toggle survives a restart. static boolean toggle = CONFIG.coordsEnabled; private static boolean shown = false; diff --git a/src/main/java/de/fullrisk/citrusDev/UI/Module_FPS.java b/src/main/java/de/fullrisk/citrusDev/UI/Module_FPS.java index 8a8bbbf..a41aa38 100644 --- a/src/main/java/de/fullrisk/citrusDev/UI/Module_FPS.java +++ b/src/main/java/de/fullrisk/citrusDev/UI/Module_FPS.java @@ -18,7 +18,6 @@ public class Module_FPS { private static final Config CONFIG = Config.get(); - // Loaded from Config instead of hardcoded, so the toggle survives a restart. static boolean toggle = CONFIG.fpsEnabled; private static boolean shown = false; diff --git a/src/main/java/de/fullrisk/citrusDev/UI/Module_KeyStrokes.java b/src/main/java/de/fullrisk/citrusDev/UI/Module_KeyStrokes.java index 3e041ac..47b1010 100644 --- a/src/main/java/de/fullrisk/citrusDev/UI/Module_KeyStrokes.java +++ b/src/main/java/de/fullrisk/citrusDev/UI/Module_KeyStrokes.java @@ -23,11 +23,10 @@ public class Module_KeyStrokes { private static FlowLayout bottomRow; private static FlowLayout wBox, aBox, sBox, dBox; - private static ScalableLabel wLabel, aLabel, sLabel, dLabel; // was LabelComponent + private static ScalableLabel wLabel, aLabel, sLabel, dLabel; private static final Config CONFIG = Config.get(); - // Loaded from Config instead of hardcoded, so the toggle survives a restart. static boolean toggle = CONFIG.keyEnabled; private static boolean shown = false; @@ -48,7 +47,7 @@ public class Module_KeyStrokes { private static final Surface GLASS_PANEL = Surface.blur(5f, 15f) .and(Surface.flat(0x40FFFFFF)); - private static int keySize = 16; // was: private static final int KEY_SIZE = 16; + private static int keySize = 16; private static FlowLayout leftSpacer, rightSpacer; private static final int PRESSED_COLOR = 0x70FFFFFF; private static final int IDLE_COLOR = 0x40FFFFFF; @@ -118,7 +117,7 @@ public class Module_KeyStrokes { } private static float labelScaleFor(int size) { - return size / 16f; // 16px box = 1.0x scale (matches the default keySize) + return size / 16f; } public static void setKeySize(int size) { @@ -144,8 +143,7 @@ public class Module_KeyStrokes { if (keyContainer == null) return; if (toggle && !shown) { - keyContainer.clearChildren(); // <-- safety net against duplicate adds - // keyContainer.surface(GLASS_PANEL); + keyContainer.clearChildren(); keyContainer.padding(Insets.of(4)); keyContainer.child(topRow); keyContainer.child(bottomRow); diff --git a/src/main/java/de/fullrisk/citrusDev/UI/OverviewScreen.java b/src/main/java/de/fullrisk/citrusDev/UI/OverviewScreen.java deleted file mode 100644 index 0261603..0000000 --- a/src/main/java/de/fullrisk/citrusDev/UI/OverviewScreen.java +++ /dev/null @@ -1,23 +0,0 @@ -package de.fullrisk.citrusDev.UI; - -import io.wispforest.owo.ui.base.BaseOwoScreen; -import io.wispforest.owo.ui.component.UIComponents; -import io.wispforest.owo.ui.container.FlowLayout; -import io.wispforest.owo.ui.container.UIContainers; -import io.wispforest.owo.ui.core.HorizontalAlignment; -import io.wispforest.owo.ui.core.OwoUIAdapter; -import io.wispforest.owo.ui.core.VerticalAlignment; -import net.minecraft.network.chat.Component; -import io.wispforest.owo.ui.core.*; -import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.sounds.SimpleSoundInstance; -import net.minecraft.network.chat.FontDescription; -import net.minecraft.resources.Identifier; -import net.minecraft.sounds.SoundEvents; -import de.fullrisk.citrusDev.UIHelper.ScalableLabel; -import de.fullrisk.citrusDev.UIHelper.ScalableButton; -import de.fullrisk.citrusDev.UIHelper.ScaleValue; - -public class OverviewScreen{ - -} \ No newline at end of file diff --git a/src/main/java/de/fullrisk/citrusDev/UI/QuestsPanel.java b/src/main/java/de/fullrisk/citrusDev/UI/QuestsPanel.java index 19c798f..29fc253 100644 --- a/src/main/java/de/fullrisk/citrusDev/UI/QuestsPanel.java +++ b/src/main/java/de/fullrisk/citrusDev/UI/QuestsPanel.java @@ -18,7 +18,6 @@ public class QuestsPanel { private static final int ACCENT = 0x64de4b; - // holds the currently open panel's Handle (if any) so tick() can refresh it private static Handle activeHandle; private static int tickCounter = 0; @@ -43,8 +42,6 @@ public class QuestsPanel { this.barWidth = barWidth; this.quests = quests; - // seed with whatever's already unlocked on open, so we don't spam - // toasts for quests the player unlocked before opening this screen for (QuestData quest : quests) { if (quest.isUnlocked()) { notifiedTitles.add(quest.title()); diff --git a/src/main/java/de/fullrisk/citrusDev/UIHelper/CitrusToast.java b/src/main/java/de/fullrisk/citrusDev/UIHelper/CitrusToast.java index 5f69ce4..454092d 100644 --- a/src/main/java/de/fullrisk/citrusDev/UIHelper/CitrusToast.java +++ b/src/main/java/de/fullrisk/citrusDev/UIHelper/CitrusToast.java @@ -74,7 +74,6 @@ public class CitrusToast implements Toast { int w = WIDTH; int h = HEIGHT; - // glass background, matching GLASS_PANEL style owo.fill(RenderPipelines.GUI, x, y, x + w, y + h, 0x40FFFFFF); owo.drawRectOutline(RenderPipelines.GUI, x, y, w, h, 0x64de4b); diff --git a/src/main/java/de/fullrisk/citrusDev/UIHelper/ModuleRow.java b/src/main/java/de/fullrisk/citrusDev/UIHelper/ModuleRow.java index e3e1a65..85343a7 100644 --- a/src/main/java/de/fullrisk/citrusDev/UIHelper/ModuleRow.java +++ b/src/main/java/de/fullrisk/citrusDev/UIHelper/ModuleRow.java @@ -13,7 +13,6 @@ import net.minecraft.sounds.SoundEvents; public class ModuleRow { - /** Bridge to whatever boolean field actually holds the module's on/off state. */ public interface ToggleState { boolean get(); void set(boolean value); diff --git a/src/main/java/de/fullrisk/citrusDev/UIHelper/SettingsControls.java b/src/main/java/de/fullrisk/citrusDev/UIHelper/SettingsControls.java index 825b151..86f286c 100644 --- a/src/main/java/de/fullrisk/citrusDev/UIHelper/SettingsControls.java +++ b/src/main/java/de/fullrisk/citrusDev/UIHelper/SettingsControls.java @@ -104,7 +104,6 @@ public class SettingsControls { return button; } - // keep the old call sites compiling; defaults to index 0 public static FlowLayout makeCyclingButton(Surface baseSurface, List states) { return makeCyclingButton(baseSurface, states, 0); } diff --git a/src/main/java/de/fullrisk/citrusDev/client/CitrusDevClient.java b/src/main/java/de/fullrisk/citrusDev/client/CitrusDevClient.java index f4bc674..57d5fd0 100644 --- a/src/main/java/de/fullrisk/citrusDev/client/CitrusDevClient.java +++ b/src/main/java/de/fullrisk/citrusDev/client/CitrusDevClient.java @@ -48,9 +48,9 @@ public class CitrusDevClient implements ClientModInitializer { while (openScreenKey.consumeClick()) { if (client.player != null && client.player.isShiftKeyDown()) { String lastModule = Config.get().lastModule; - client.setScreen(new MyScreen(lastModule)); // sneak + RShift: last module + client.setScreen(new MyScreen(lastModule)); } else { - client.setScreen(new MyScreen(null)); // RShift alone: general tab + client.setScreen(new MyScreen(null)); } } diff --git a/src/main/java/de/fullrisk/citrusDev/client/PlaytimeTracker.java b/src/main/java/de/fullrisk/citrusDev/client/PlaytimeTracker.java index bc8571d..97be81b 100644 --- a/src/main/java/de/fullrisk/citrusDev/client/PlaytimeTracker.java +++ b/src/main/java/de/fullrisk/citrusDev/client/PlaytimeTracker.java @@ -1,10 +1,3 @@ -// PLACE THIS FILE AT: -// src/client/java/de/fullrisk/citrusDev/client/PlaytimeTracker.java -// -// NOT under src/main/java — MinecraftClient and client.player only exist -// on the client source set. That is the actual cause of the -// "Cannot resolve symbol" errors, not a mistake in this code. - package de.fullrisk.citrusDev.client; import net.minecraft.client.Minecraft; @@ -19,15 +12,9 @@ import com.google.gson.JsonParser; public class PlaytimeTracker { - //ticks zu backend schicken + private static final String BACKEND_URL = "http://62.116.42.223:25501/api/heartbeat"; - private static final String BACKEND_URL = - "http://62.116.42.223:25501/api/heartbeat"; - - private static final HttpClient HTTP = - HttpClient.newBuilder() - .connectTimeout(Duration.ofSeconds(10)) - .build(); + private static final HttpClient HTTP = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(10)).build(); private static int ticks = 0; private static int currentPlaytimeSeconds = 0; @@ -42,16 +29,14 @@ public class PlaytimeTracker { if (ticks >= 60) { ticks = 0; sendHeartbeat(); - getPlaytime(); // <-- add this - + getPlaytime(); } } private static void sendHeartbeat() { Verifier.sendTokenForVerification(); - - Minecraft client = - Minecraft.getInstance(); + + Minecraft client = Minecraft.getInstance(); if (client.player == null) { System.out.println("No player yet"); @@ -86,15 +71,9 @@ public class PlaytimeTracker { } - - //playtime vom server holen - - private static final String PLAYTIME_URL = - "http://62.116.42.223:25501/api/player/%s/playtime"; - + private static final String PLAYTIME_URL = "http://62.116.42.223:25501/api/player/%s/playtime"; public static void getPlaytime() { - Minecraft client = Minecraft.getInstance(); if (client.player == null) { @@ -103,57 +82,24 @@ public class PlaytimeTracker { UUID uuid = client.player.getUUID(); - HttpRequest request = HttpRequest.newBuilder() - .uri(URI.create( - PLAYTIME_URL.formatted(uuid) - )) + HttpRequest request = HttpRequest.newBuilder().uri(URI.create(PLAYTIME_URL.formatted(uuid))) .GET() .build(); - HTTP.sendAsync( - request, - HttpResponse.BodyHandlers.ofString() - ) + HTTP.sendAsync(request, HttpResponse.BodyHandlers.ofString()) .thenAccept(response -> { - if (response.statusCode() == 200) { - String json = response.body(); - JsonObject data = - JsonParser.parseString(json) - .getAsJsonObject(); + JsonObject data = JsonParser.parseString(json).getAsJsonObject(); - - currentPlaytimeSeconds = - data.get("playtime_seconds") - .getAsInt(); - - - // Compare playtime here - if (currentPlaytimeSeconds >= 3600) { - System.out.println( - "Player has more than 1 hour!" - ); - } - else { - System.out.println( - "Player needs more time" - ); - } - - - System.out.println( - "Seconds played: " + currentPlaytimeSeconds - ); + currentPlaytimeSeconds = data.get("playtime_seconds").getAsInt(); } else { - System.out.println( - "Failed: " + response.statusCode() - ); + System.err.println("Failed: " + response.statusCode()); + throw new RuntimeException("Failed to get playtime: " + response.statusCode()); } - }); } diff --git a/src/main/java/de/fullrisk/citrusDev/client/Verifier.java b/src/main/java/de/fullrisk/citrusDev/client/Verifier.java index 4aded8c..5747f9b 100644 --- a/src/main/java/de/fullrisk/citrusDev/client/Verifier.java +++ b/src/main/java/de/fullrisk/citrusDev/client/Verifier.java @@ -10,9 +10,7 @@ public class Verifier { private static final String VERIFY_URL = "http://62.116.42.223:25501/api/verify"; - private static final HttpClient HTTP = HttpClient.newBuilder() - .connectTimeout(Duration.ofSeconds(10)) - .build(); + private static final HttpClient HTTP = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(10)).build(); public static void sendTokenForVerification() { String accessToken = Authentication.getAccessToken(); diff --git a/src/main/java/de/fullrisk/citrusDev/mixin/SliderComponentMixin.java b/src/main/java/de/fullrisk/citrusDev/mixin/SliderComponentMixin.java index b609dc1..55ec066 100644 --- a/src/main/java/de/fullrisk/citrusDev/mixin/SliderComponentMixin.java +++ b/src/main/java/de/fullrisk/citrusDev/mixin/SliderComponentMixin.java @@ -27,10 +27,8 @@ public abstract class SliderComponentMixin { OwoUIGraphics owo = OwoUIGraphics.of(graphics); - // glass track owo.fill(RenderPipelines.GUI, x, y, x + w, y + h, 0x40FFFFFF); - // handle int handleWidth = 4; int handleX = x + (int) (slider.value() * (w - handleWidth)); owo.fill(RenderPipelines.GUI, handleX, y, handleX + handleWidth, y + h, 0xFFFFFFFF);