diff --git a/src/main/java/me/zeroeightsix/kami/command/commands/FixGuiCommand.java b/src/main/java/me/zeroeightsix/kami/command/commands/FixGuiCommand.java index 9e5259ec..3b1d002e 100644 --- a/src/main/java/me/zeroeightsix/kami/command/commands/FixGuiCommand.java +++ b/src/main/java/me/zeroeightsix/kami/command/commands/FixGuiCommand.java @@ -18,14 +18,7 @@ public class FixGuiCommand extends Command { @Override public void call(String[] args) { - FixGui fixGui = MODULE_MANAGER.getModuleT(FixGui.class); - if (fixGui.isEnabled()) { - fixGui.disable(); - sendChatMessage("[" + getLabel() + "] Disabled"); - } - else { - fixGui.enable(); - sendChatMessage("[" + getLabel() + "] Enabled"); - } + MODULE_MANAGER.getModuleT(FixGui.class).enable(); + sendChatMessage(getChatLabel() + "Ran"); } } diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/combat/BreakingWarning.java b/src/main/java/me/zeroeightsix/kami/module/modules/combat/BreakingWarning.java index 38c4df48..da1ed9eb 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/combat/BreakingWarning.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/combat/BreakingWarning.java @@ -15,6 +15,8 @@ import net.minecraft.item.ItemPickaxe; import net.minecraft.network.play.server.SPacketBlockBreakAnim; import net.minecraft.util.math.BlockPos; +import static me.zeroeightsix.kami.gui.kami.DisplayGuiScreen.getScale; + /** * @author Antonio32A * Updated by S-B99 on 31/03/20 @@ -70,8 +72,7 @@ public class BreakingWarning extends Module { String text = playerName + " is breaking blocks near you!"; FontRenderer renderer = Wrapper.getFontRenderer(); - int divider = mc.gameSettings.guiScale; - if (divider == 0) divider = 3; + int divider = getScale(); renderer.drawStringWithShadow(mc.displayWidth / divider / 2 - renderer.getStringWidth(text) / 2, mc.displayHeight / divider / 2 - 16, 240, 87, 70, text); } diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/player/LagNotifier.java b/src/main/java/me/zeroeightsix/kami/module/modules/player/LagNotifier.java index fd28d88f..69526942 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/player/LagNotifier.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/player/LagNotifier.java @@ -9,6 +9,7 @@ import me.zeroeightsix.kami.setting.Setting; import me.zeroeightsix.kami.setting.Settings; import me.zeroeightsix.kami.util.Wrapper; +import static me.zeroeightsix.kami.gui.kami.DisplayGuiScreen.getScale; import static me.zeroeightsix.kami.util.InfoCalculator.round; /** @@ -26,8 +27,8 @@ public class LagNotifier extends Module { String text = "Server Not Responding! " + timeDifference() + "s"; FontRenderer renderer = Wrapper.getFontRenderer(); - int divider = mc.gameSettings.guiScale; - if (divider == 0) divider = 3; /* 217 is the offset to make it go high, bigger = higher, with 0 being center */ + int divider = getScale(); + /* 217 is the offset to make it go high, bigger = higher, with 0 being center */ renderer.drawStringWithShadow(mc.displayWidth / divider / 2 - renderer.getStringWidth(text) / 2, mc.displayHeight / divider / 2 - 217, 255, 85, 85, text); } diff --git a/src/main/java/me/zeroeightsix/kami/util/GuiFrameUtil.java b/src/main/java/me/zeroeightsix/kami/util/GuiFrameUtil.java index 6fde4dec..82d5e34e 100644 --- a/src/main/java/me/zeroeightsix/kami/util/GuiFrameUtil.java +++ b/src/main/java/me/zeroeightsix/kami/util/GuiFrameUtil.java @@ -9,6 +9,8 @@ import org.lwjgl.opengl.Display; import java.util.List; +import static me.zeroeightsix.kami.gui.kami.DisplayGuiScreen.getScale; + /** * @author S-B99 * Created by S-B99 on 24/03/20 @@ -42,8 +44,7 @@ public class GuiFrameUtil { if (kamiGUI == null || mc.player == null) return; List frames = ContainerHelper.getAllChildren(Frame.class, kamiGUI); for (Frame frame : frames) { - int divider = mc.gameSettings.guiScale; - if (divider == 0) divider = 3; + int divider = getScale(); if (frame.getX() > (Display.getWidth() / divider)) { frame.setX((Display.getWidth() / divider) - frame.getWidth()); }