clean up a little

moehreag · moehreag · commit e175e6408bfc · 2022-11-16T01:29:28.000+01:00
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/HudManager.java b/src/main/java/io/github/axolotlclient/modules/hud/HudManager.java
@@ -6,13 +6,13 @@
 import io.github.axolotlclient.modules.hud.gui.AbstractHudEntry;
 import io.github.axolotlclient.modules.hud.gui.component.HudEntry;
 import io.github.axolotlclient.modules.hud.gui.hud.*;
-import io.github.axolotlclient.modules.hud.gui.hud.item.*;
+import io.github.axolotlclient.modules.hud.gui.hud.item.ArmorHud;
+import io.github.axolotlclient.modules.hud.gui.hud.item.ArrowHud;
+import io.github.axolotlclient.modules.hud.gui.hud.item.ItemUpdateHud;
 import io.github.axolotlclient.modules.hud.gui.hud.simple.*;
 import io.github.axolotlclient.modules.hud.gui.hud.vanilla.*;
 import io.github.axolotlclient.modules.hud.util.Rectangle;
-import net.legacyfabric.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.legacyfabric.fabric.api.client.keybinding.v1.KeyBindingHelper;
-import net.legacyfabric.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.options.KeyBinding;
 import net.minecraft.util.Identifier;
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/AbstractHudEntry.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/AbstractHudEntry.java
@@ -204,7 +204,7 @@ public List<Option<?>> getConfigurationOptions() {
     /**
      * Returns a list of options that should be saved. By default, this includes {@link #getConfigurationOptions()}
      *
-     * @return
+     * @return a list of options.
      */
     @Override
     public List<Option<?>> getSaveOptions() {
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/CoordsHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/CoordsHud.java
@@ -65,8 +65,8 @@ public static String getXDir(int dir) {
     /**
      * Get direction. 1 = North, 2 North East, 3 East, 4 South East...
      *
-     * @param yaw
-     * @return
+     * @param yaw the player's yaw
+     * @return the direction, 0-360 degrees.
      */
     public static int getDirection(double yaw) {
         yaw %= 360;
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java
@@ -5,7 +5,6 @@
 import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.ColorOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.Option;
-import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
 import io.github.axolotlclient.modules.hud.gui.entry.TextHudEntry;
 import io.github.axolotlclient.modules.hud.util.DrawPosition;
 import io.github.axolotlclient.modules.hud.util.DrawUtil;
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/MemoryHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/MemoryHud.java
@@ -4,7 +4,6 @@
 import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.ColorOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.Option;
-import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
 import io.github.axolotlclient.modules.hud.gui.entry.TextHudEntry;
 import io.github.axolotlclient.modules.hud.util.DrawPosition;
 import io.github.axolotlclient.modules.hud.util.Rectangle;
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/PackDisplayHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/PackDisplayHud.java
@@ -3,7 +3,6 @@
 import com.mojang.blaze3d.platform.GlStateManager;
 import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.Option;
-import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
 import io.github.axolotlclient.modules.hud.gui.entry.TextHudEntry;
 import io.github.axolotlclient.modules.hud.util.DrawPosition;
 import io.github.axolotlclient.util.Logger;
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/PlayerHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/PlayerHud.java
@@ -5,7 +5,6 @@
 import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.DoubleOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.Option;
-import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
 import io.github.axolotlclient.modules.hud.gui.entry.BoxHudEntry;
 import io.github.axolotlclient.util.Hooks;
 import lombok.Getter;
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/PotionsHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/PotionsHud.java
@@ -4,7 +4,6 @@
 import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.EnumOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.Option;
-import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
 import io.github.axolotlclient.modules.hud.gui.component.DynamicallyPositionable;
 import io.github.axolotlclient.modules.hud.gui.entry.TextHudEntry;
 import io.github.axolotlclient.modules.hud.gui.layout.AnchorPoint;
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/ToggleSprintHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/ToggleSprintHud.java
@@ -1,9 +1,7 @@
 package io.github.axolotlclient.modules.hud.gui.hud;
 
-
 import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.Option;
-import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
 import io.github.axolotlclient.AxolotlclientConfig.options.StringOption;
 import io.github.axolotlclient.modules.hud.gui.entry.SimpleTextHudEntry;
 import lombok.Getter;
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/iconHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/iconHud.java
@@ -3,7 +3,6 @@
 import com.mojang.blaze3d.platform.GlStateManager;
 import io.github.axolotlclient.AxolotlClient;
 import io.github.axolotlclient.modules.hud.gui.entry.BoxHudEntry;
-import io.github.axolotlclient.modules.hud.util.DrawPosition;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.util.Identifier;
 
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/item/ItemUpdateHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/item/ItemUpdateHud.java
@@ -4,7 +4,6 @@
 import io.github.axolotlclient.AxolotlclientConfig.Color;
 import io.github.axolotlclient.AxolotlclientConfig.options.IntegerOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.Option;
-import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
 import io.github.axolotlclient.modules.hud.gui.entry.TextHudEntry;
 import io.github.axolotlclient.modules.hud.util.DrawPosition;
 import io.github.axolotlclient.modules.hud.util.ItemUtil;
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/ComboHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/ComboHud.java
@@ -5,7 +5,6 @@
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.Util;
 
 /**
  * This implementation of Hud modules is based on KronHUD.
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/IRLTimeHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/IRLTimeHud.java
@@ -1,7 +1,6 @@
 package io.github.axolotlclient.modules.hud.gui.hud.simple;
 
 import io.github.axolotlclient.AxolotlclientConfig.options.Option;
-import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
 import io.github.axolotlclient.AxolotlclientConfig.options.StringOption;
 import io.github.axolotlclient.modules.hud.gui.entry.SimpleTextHudEntry;
 import net.minecraft.util.Identifier;
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/ReachHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/ReachHud.java
@@ -3,7 +3,6 @@
 import com.google.common.util.concurrent.AtomicDouble;
 import io.github.axolotlclient.AxolotlclientConfig.options.IntegerOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.Option;
-import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
 import io.github.axolotlclient.modules.hud.gui.entry.SimpleTextHudEntry;
 import io.github.axolotlclient.util.Util;
 import net.minecraft.client.MinecraftClient;
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/SpeedHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/SpeedHud.java
@@ -2,7 +2,6 @@
 
 import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.Option;
-import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
 import io.github.axolotlclient.modules.hud.gui.entry.SimpleTextHudEntry;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.Identifier;
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/ActionBarHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/ActionBarHud.java
@@ -4,7 +4,6 @@
 import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.IntegerOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.Option;
-import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
 import io.github.axolotlclient.modules.hud.gui.entry.TextHudEntry;
 import lombok.Getter;
 import net.minecraft.util.Identifier;
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/BossBarHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/BossBarHud.java
@@ -5,7 +5,6 @@
 import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.EnumOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.Option;
-import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
 import io.github.axolotlclient.modules.hud.gui.component.DynamicallyPositionable;
 import io.github.axolotlclient.modules.hud.gui.entry.TextHudEntry;
 import io.github.axolotlclient.modules.hud.gui.layout.AnchorPoint;
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/HotbarHUD.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/HotbarHUD.java
@@ -2,7 +2,6 @@
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import io.github.axolotlclient.AxolotlclientConfig.options.Option;
-import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
 import io.github.axolotlclient.modules.hud.gui.entry.TextHudEntry;
 import io.github.axolotlclient.modules.hud.util.DrawPosition;
 import io.github.axolotlclient.modules.hud.util.ItemUtil;
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/layout/AnchorPoint.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/layout/AnchorPoint.java
@@ -11,19 +11,17 @@
 
 @AllArgsConstructor
 public enum AnchorPoint {
-    TOP_LEFT("topleft", -1, 1),
-    TOP_MIDDLE("topmiddle", 0, 1),
-    TOP_RIGHT("topright", 1, 1),
-    MIDDLE_LEFT("middleleft", -1, 0),
-    MIDDLE_MIDDLE("middlemiddle", 0, 0),
-    MIDDLE_RIGHT("middleright", 1, 0),
-    BOTTOM_LEFT("bottomleft", -1, -1),
-    BOTTOM_MIDDLE("bottommiddle", 0, -1),
-    BOTTOM_RIGHT("bottomright", 1, -1),
+    TOP_LEFT(-1, 1),
+    TOP_MIDDLE(0, 1),
+    TOP_RIGHT(1, 1),
+    MIDDLE_LEFT(-1, 0),
+    MIDDLE_MIDDLE(0, 0),
+    MIDDLE_RIGHT(1, 0),
+    BOTTOM_LEFT(-1, -1),
+    BOTTOM_MIDDLE(0, -1),
+    BOTTOM_RIGHT(1, -1),
     ;
 
-    private final String key;
-
     @Getter
     private final int xComponent;
 
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/layout/CardinalOrder.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/layout/CardinalOrder.java
@@ -11,13 +11,12 @@
 
 @AllArgsConstructor
 public enum CardinalOrder {
-    TOP_DOWN("topdown", false, -1),
-    DOWN_TOP("downtop", false, 1),
-    LEFT_RIGHT("leftright", true, 1),
-    RIGHT_LEFT("rightleft", true, -1),
+    TOP_DOWN(false, -1),
+    DOWN_TOP(false, 1),
+    LEFT_RIGHT(true, 1),
+    RIGHT_LEFT(true, -1),
     ;
 
-    private final String key;
     @Getter
     private final boolean xAxis;
     @Getter
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/util/DrawPosition.java b/src/main/java/io/github/axolotlclient/modules/hud/util/DrawPosition.java
@@ -1,7 +1,6 @@
 package io.github.axolotlclient.modules.hud.util;
 
 import lombok.Data;
-import lombok.Getter;
 import lombok.experimental.Accessors;
 
 /**
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/util/ItemUtil.java b/src/main/java/io/github/axolotlclient/modules/hud/util/ItemUtil.java
@@ -189,19 +189,17 @@ public static void renderGuiItemOverlay(TextRenderer renderer, ItemStack stack,
 
 	private static void renderGuiQuad(BufferBuilder buffer, int x, int y, int width, int height, int red, int green, int blue, int alpha) {
 		buffer.begin(7, VertexFormats.POSITION_COLOR);
-		buffer.vertex((double)(x + 0), (double)(y + 0), 0.0).color(red, green, blue, alpha).next();
-		buffer.vertex((double)(x + 0), (double)(y + height), 0.0).color(red, green, blue, alpha).next();
-		buffer.vertex((double)(x + width), (double)(y + height), 0.0).color(red, green, blue, alpha).next();
-		buffer.vertex((double)(x + width), (double)(y + 0), 0.0).color(red, green, blue, alpha).next();
+		buffer.vertex(x, y, 0.0).color(red, green, blue, alpha).next();
+		buffer.vertex(x, y + height, 0.0).color(red, green, blue, alpha).next();
+		buffer.vertex(x + width, y + height, 0.0).color(red, green, blue, alpha).next();
+		buffer.vertex(x + width, y, 0.0).color(red, green, blue, alpha).next();
 		Tessellator.getInstance().draw();
 	}
 
 	public static class ItemStorage {
 		public final ItemStack stack;
 		public int times;
-		public ItemStorage(ItemStack stack) {
-			this(stack, 1);
-		}
+
 		public ItemStorage(ItemStack stack, int times) {
 			ItemStack copy = stack.copy();
 			copy.count =1;
@@ -220,9 +218,7 @@ public TimedItemStorage timed() {
 	}
 	public static class TimedItemStorage extends ItemStorage {
 		public float start;
-		public TimedItemStorage(ItemStack stack) {
-			this(stack, 1);
-		}
+
 		public TimedItemStorage(ItemStack stack, int times) {
 			super(stack, times);
 			this.start = MinecraftClient.getTime();
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/util/Rectangle.java b/src/main/java/io/github/axolotlclient/modules/hud/util/Rectangle.java
@@ -40,12 +40,11 @@ public boolean isMouseOver(double mouseX, double mouseY){
         return mouseX>=x && mouseX<=x+width && mouseY >=y && mouseY <= y+height;
     }
 
-    public Rectangle setData(int x, int y, int width, int height){
+    public void setData(int x, int y, int width, int height){
         this.x = x;
         this.y = y;
         this.width = width;
         this.height = height;
-        return this;
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public List<Option<?>> getConfigurationOptions() {`
`204`	`204`	`/**`
`205`	`205`	`* Returns a list of options that should be saved. By default, this includes {@link #getConfigurationOptions()}`
`206`	`206`	`*`
`207`		`- * @return`
	`207`	`+ * @return a list of options.`
`208`	`208`	`*/`
`209`	`209`	`@Override`
`210`	`210`	`public List<Option<?>> getSaveOptions() {`