diff options
Diffstat (limited to 'src/main')
5 files changed, 16 insertions, 14 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/ScreenBuilder.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/ScreenBuilder.java index f570f6db..feb351da 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/ScreenBuilder.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/ScreenBuilder.java @@ -1,16 +1,12 @@ package me.xmrvizzy.skyblocker.skyblock.tabhud.screenbuilder; import java.io.BufferedReader; -import java.io.IOException; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.HashMap; import java.util.NoSuchElementException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/AlignStage.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/AlignStage.java index 0f2e4107..e0ecbab0 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/AlignStage.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/AlignStage.java @@ -77,16 +77,16 @@ public class AlignStage extends PipelineStage { wid.setY(hHalf + ScreenConst.WIDGET_PAD_HALF); break; case TOP: - wid.setY(ScreenConst.SCREEN_PAD); + wid.setY(ScreenConst.getScreenPad()); break; case BOT: - wid.setY(screenH - wid.getHeight() - ScreenConst.SCREEN_PAD); + wid.setY(screenH - wid.getHeight() - ScreenConst.getScreenPad()); break; case LEFT: - wid.setX(ScreenConst.SCREEN_PAD); + wid.setX(ScreenConst.getScreenPad()); break; case RIGHT: - wid.setX(screenW - wid.getWidth() - ScreenConst.SCREEN_PAD); + wid.setX(screenW - wid.getWidth() - ScreenConst.getScreenPad()); break; } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/PlaceStage.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/PlaceStage.java index 0f91a161..4d19edd2 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/PlaceStage.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/PlaceStage.java @@ -53,7 +53,7 @@ public class PlaceStage extends PipelineStage { break; case TOPCENT: wid.setX((screenW - wid.getWidth()) / 2); - wid.setY(ScreenConst.SCREEN_PAD); + wid.setY(ScreenConst.getScreenPad()); break; } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/StackStage.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/StackStage.java index b614caef..d861b5b8 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/StackStage.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/StackStage.java @@ -86,8 +86,8 @@ public class StackStage extends PipelineStage { int y = switch (this.align) { - case TOP -> y = ScreenConst.SCREEN_PAD; - case BOT -> y = (screenH - compHeight) - ScreenConst.SCREEN_PAD; + case TOP -> y = ScreenConst.getScreenPad(); + case BOT -> y = (screenH - compHeight) - ScreenConst.getScreenPad(); default -> y = (screenH - compHeight) / 2; }; @@ -106,8 +106,8 @@ public class StackStage extends PipelineStage { int x = switch (this.align) { - case LEFT-> x = ScreenConst.SCREEN_PAD; - case RIGHT -> x = (screenW - compWidth) - ScreenConst.SCREEN_PAD; + case LEFT-> x = ScreenConst.getScreenPad(); + case RIGHT -> x = (screenW - compWidth) - ScreenConst.getScreenPad(); default -> x = (screenW - compWidth) / 2; }; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/ScreenConst.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/ScreenConst.java index 8788c017..74824e3f 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/ScreenConst.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/ScreenConst.java @@ -1,7 +1,13 @@ package me.xmrvizzy.skyblocker.skyblock.tabhud.util; +import me.xmrvizzy.skyblocker.config.SkyblockerConfig; + public class ScreenConst { public static final int WIDGET_PAD = 5; public static final int WIDGET_PAD_HALF = 3; - public static final int SCREEN_PAD = 10; + private static final int SCREEN_PAD_BASE = 10; + + public static int getScreenPad() { + return (int) ((1f/((float)SkyblockerConfig.get().general.tabHud.tabHudScale/100f) * SCREEN_PAD_BASE)); + } } |