From 891b7f3745b3d6ed7d4d3ef41b80ea04cb51f593 Mon Sep 17 00:00:00 2001 From: Shirona1337 Date: Thu, 21 May 2026 22:06:46 +0800 Subject: [PATCH] chore: clean up debug prints and register HUD/intro on event bus - Register HudManager and a fresh IntroAnimation on the event bus during ZenClient bootstrap so HUDs actually tick and the intro plays on first launch. - Strip leftover System.out.println debug breadcrumbs from NewClickGui, CategoryPanel, ModuleElement and the unused BUILD_TAG print in ModuleElement. - Drop the redundant 'initialized' static flag and the stray NewClickGui instance constructed in the class initializer; the Lombok @NonNull null check on render() was already enforced, so the hand-written guard goes too. - Remove the unused NumberSettingElement.sliderX field. - Replace Module.getBind() with a Lombok @Getter on the field. Co-Authored-By: Claude Opus 4.7 --- src/main/java/shit/zen/ZenClient.java | 3 +++ src/main/java/shit/zen/gui/NewClickGui.java | 13 +++---------- .../shit/zen/gui/newclickgui/CategoryPanel.java | 3 --- .../shit/zen/gui/newclickgui/ModuleElement.java | 1 - .../zen/gui/newclickgui/NumberSettingElement.java | 1 - src/main/java/shit/zen/modules/Module.java | 6 ++---- 6 files changed, 8 insertions(+), 19 deletions(-) diff --git a/src/main/java/shit/zen/ZenClient.java b/src/main/java/shit/zen/ZenClient.java index 9fa19ab..e82c794 100644 --- a/src/main/java/shit/zen/ZenClient.java +++ b/src/main/java/shit/zen/ZenClient.java @@ -11,6 +11,7 @@ import net.minecraftforge.fml.common.Mod; import shit.zen.event.EventBus; import shit.zen.event.EventTarget; import shit.zen.event.impl.TickEvent; +import shit.zen.gui.IntroAnimation; import shit.zen.manager.CommandManager; import shit.zen.manager.ConfigManager; import shit.zen.manager.HudManager; @@ -88,10 +89,12 @@ public class ZenClient extends ClientBase { this.configManager = new ConfigManager(); this.lagManager = new LagManager(); this.targetManager = new TargetManager(); + this.eventBus.register(this.hudManager); this.eventBus.register(this.lagManager); this.eventBus.register(this.targetManager); this.eventBus.register(this); this.commandManager.initCommands(); + this.eventBus.register(new IntroAnimation()); registerPatches(); if (PatchAgent.getInstrumentation() != null) { PatchAgent.installPatchesAndRetransform(); diff --git a/src/main/java/shit/zen/gui/NewClickGui.java b/src/main/java/shit/zen/gui/NewClickGui.java index 98b7fa0..8ddac7d 100644 --- a/src/main/java/shit/zen/gui/NewClickGui.java +++ b/src/main/java/shit/zen/gui/NewClickGui.java @@ -16,7 +16,6 @@ import shit.zen.utils.math.Easings; public class NewClickGui extends Screen { private static final List categoryPanels; - private static boolean initialized; public static CategoryPanel focusedPanel; @Getter private boolean closing = false; @@ -25,11 +24,11 @@ extends Screen { public NewClickGui() { super(Component.literal("ClickGui")); - System.out.println("12"); + // System.out.println("12"); } protected void init() { - System.out.println("13"); + // System.out.println("13"); focusedPanel = categoryPanels.get(0); float panelX = (float)this.width / 2.0f - 380.0f; for (CategoryPanel categoryPanel : categoryPanels) { @@ -37,14 +36,10 @@ extends Screen { categoryPanel.setY(36.0f); panelX += 128.0f; } - initialized = true; - System.out.println("14"); + // System.out.println("14"); } public void render(@NonNull GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { - if (guiGraphics == null) { - throw new NullPointerException("graphics is marked non-null but is null"); - } this.closeAnim.animate(this.closing ? 0.0 : 1.0, 0.2, Easings.EASE_OUT_POW2); this.closeAnim.tick(); float closeProgress = this.closeAnim.getValueF(); @@ -92,9 +87,7 @@ extends Screen { } static { - NewClickGui newClickGui = new NewClickGui(); categoryPanels = new ArrayList<>(); - initialized = false; for (Category category : Category.values()) { categoryPanels.add(new CategoryPanel(category)); } diff --git a/src/main/java/shit/zen/gui/newclickgui/CategoryPanel.java b/src/main/java/shit/zen/gui/newclickgui/CategoryPanel.java index 77bf9f2..f159c05 100644 --- a/src/main/java/shit/zen/gui/newclickgui/CategoryPanel.java +++ b/src/main/java/shit/zen/gui/newclickgui/CategoryPanel.java @@ -77,14 +77,11 @@ extends UIElement { private float savedHeight; public CategoryPanel(Category category) { - System.out.println("15"); this.category = category; for (Module module : ZenClient.getInstance().getModuleManager().getModulesByCategory(category)) { this.moduleElements.add(new ModuleElement(this, module)); } - System.out.println("15.5"); this.panelHeight = 20.0f + Math.min(240.0f, 20.0f * (float)this.moduleElements.size()); - System.out.println("16"); } @Override diff --git a/src/main/java/shit/zen/gui/newclickgui/ModuleElement.java b/src/main/java/shit/zen/gui/newclickgui/ModuleElement.java index 5318fe2..fb95763 100644 --- a/src/main/java/shit/zen/gui/newclickgui/ModuleElement.java +++ b/src/main/java/shit/zen/gui/newclickgui/ModuleElement.java @@ -56,7 +56,6 @@ extends UIElement { private static final String BUILD_TAG; public ModuleElement(CategoryPanel categoryPanel, Module module) { - System.out.println(BUILD_TAG); this.parentPanel = categoryPanel; this.module = module; for (Setting setting : module.getSettings()) { diff --git a/src/main/java/shit/zen/gui/newclickgui/NumberSettingElement.java b/src/main/java/shit/zen/gui/newclickgui/NumberSettingElement.java index fd7a4ab..bb12726 100644 --- a/src/main/java/shit/zen/gui/newclickgui/NumberSettingElement.java +++ b/src/main/java/shit/zen/gui/newclickgui/NumberSettingElement.java @@ -20,7 +20,6 @@ extends SettingElement { private final SmoothAnimationTimer sliderTimer = new SmoothAnimationTimer(); private boolean isTruncated; private boolean isHovered; - float sliderX; private boolean isDragging; public NumberSettingElement(CategoryPanel categoryPanel, NumberSetting numberSetting) { diff --git a/src/main/java/shit/zen/modules/Module.java b/src/main/java/shit/zen/modules/Module.java index df574a1..f946441 100644 --- a/src/main/java/shit/zen/modules/Module.java +++ b/src/main/java/shit/zen/modules/Module.java @@ -7,6 +7,7 @@ import lombok.Getter; import lombok.Generated; import shit.zen.ClientBase; import shit.zen.ZenClient; +import shit.zen.hud.ModuleListHud; import shit.zen.modules.Category; import shit.zen.modules.KeyBind; import shit.zen.settings.Setting; @@ -18,6 +19,7 @@ extends ClientBase { @Getter private final Category category; private int keyCode; + @Getter private final KeyBind bind; @Getter private boolean enabled; @@ -46,10 +48,6 @@ extends ClientBase { this.bind.setKey(keyCode); } - public KeyBind getBind() { - return this.bind; - } - public void addSetting(Setting setting) { this.settings.add(setting); }