From 8aab3a94dbe2ff06c31a31b504bdfe0e7fc29942 Mon Sep 17 00:00:00 2001 From: viciscat <51047087+viciscat@users.noreply.github.com> Date: Thu, 18 Jul 2024 17:35:24 +0200 Subject: aaron has trypophobia real --- .../skyblocker/skyblock/tabhud/config/WidgetsConfigurationScreen.java | 1 - .../de/hysky/skyblocker/skyblock/tabhud/config/WidgetsElementList.java | 2 +- .../de/hysky/skyblocker/skyblock/tabhud/config/WidgetsOrderingTab.java | 1 - .../hysky/skyblocker/skyblock/tabhud/config/entries/WidgetEntry.java | 3 --- .../hysky/skyblocker/skyblock/tabhud/screenbuilder/ScreenMaster.java | 1 - .../skyblock/tabhud/screenbuilder/pipeline/PositionRule.java | 2 -- .../java/de/hysky/skyblocker/skyblock/tabhud/widget/HudWidget.java | 2 -- 7 files changed, 1 insertion(+), 11 deletions(-) (limited to 'src') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/WidgetsConfigurationScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/WidgetsConfigurationScreen.java index 7e997b9e..e40bc91d 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/WidgetsConfigurationScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/WidgetsConfigurationScreen.java @@ -25,7 +25,6 @@ import org.slf4j.Logger; import java.util.Map; public class WidgetsConfigurationScreen extends Screen implements ScreenHandlerListener { - public static final Logger LOGGER = LogUtils.getLogger(); private GenericContainerScreenHandler handler; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/WidgetsElementList.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/WidgetsElementList.java index cc56b8c4..6d587e74 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/WidgetsElementList.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/WidgetsElementList.java @@ -10,11 +10,11 @@ import net.minecraft.util.Identifier; import java.util.Objects; public class WidgetsElementList extends ElementListWidget { - static final Identifier MOVE_UP_HIGHLIGHTED_TEXTURE = Identifier.ofVanilla("transferable_list/move_up_highlighted"); static final Identifier MOVE_UP_TEXTURE = Identifier.ofVanilla("transferable_list/move_up"); static final Identifier MOVE_DOWN_HIGHLIGHTED_TEXTURE = Identifier.ofVanilla("transferable_list/move_down_highlighted"); static final Identifier MOVE_DOWN_TEXTURE = Identifier.ofVanilla("transferable_list/move_down"); + private final WidgetsOrderingTab parent; private boolean rightUpArrowHovered = false; private boolean rightDownArrowHovered = false; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/WidgetsOrderingTab.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/WidgetsOrderingTab.java index 9785f982..9ed827a5 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/WidgetsOrderingTab.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/WidgetsOrderingTab.java @@ -22,7 +22,6 @@ import java.util.function.Consumer; // TODO: recommend disabling spacing and enabling wrapping public class WidgetsOrderingTab implements Tab { - private final WidgetsElementList widgetsElementList; private final ButtonWidget back; private final ButtonWidget previousPage; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/entries/WidgetEntry.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/entries/WidgetEntry.java index b7c1508e..33bf1c00 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/entries/WidgetEntry.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/entries/WidgetEntry.java @@ -14,9 +14,6 @@ import net.minecraft.util.Colors; import java.util.List; public class WidgetEntry extends WidgetsListEntry { - - - private final ButtonWidget editButton; private final State state; private final ButtonWidget enableButton; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/ScreenMaster.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/ScreenMaster.java index 7388879f..bdfe792b 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/ScreenMaster.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/ScreenMaster.java @@ -155,7 +155,6 @@ public class ScreenMaster { @Init public static void init() { - SkyblockEvents.LOCATION_CHANGE.register(location -> ScreenBuilder.positionsNeedsUpdating = true); HudRenderEvents.BEFORE_CHAT.register((context, tickDelta) -> { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/pipeline/PositionRule.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/pipeline/PositionRule.java index 0504c99b..add63e62 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/pipeline/PositionRule.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/screenbuilder/pipeline/PositionRule.java @@ -7,9 +7,7 @@ import org.jetbrains.annotations.Nullable; public record PositionRule(String parent, Point parentPoint, Point thisPoint, int relativeX, int relativeY, ScreenMaster.ScreenLayer screenLayer) { - public static final PositionRule DEFAULT = new PositionRule("screen", Point.DEFAULT, Point.DEFAULT, 5, 5, ScreenMaster.ScreenLayer.DEFAULT); - public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( Codec.STRING.fieldOf("parent").forGetter(PositionRule::parent), Point.CODEC.fieldOf("parent_anchor").forGetter(PositionRule::parentPoint), diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/HudWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/HudWidget.java index 4cbe9a85..414f9241 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/HudWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/HudWidget.java @@ -14,8 +14,6 @@ import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.client.gui.widget.Widget; public abstract class HudWidget implements Element, Widget, Drawable { - - private final String internalID; protected int w = 0, h = 0; protected int x = 0, y = 0; -- cgit