diff --git a/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java b/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java index b38448c..f4fce8f 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java +++ b/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java @@ -134,6 +134,10 @@ public class ConfigHandler implements IWailaConfigHandler { return getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true); } + public boolean showIcon() { + return getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOWICON, true); + } + /* Default config loading */ public void loadDefaultConfig(FMLPreInitializationEvent event) { @@ -145,6 +149,7 @@ public class ConfigHandler implements IWailaConfigHandler { config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_METADATA, false); config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_KEYBIND, true); config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_NEWFILTERS, true); + config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOWICON, true); OverlayConfig.posX = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSX, 5000).getInt(); OverlayConfig.posY = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSY, 100).getInt(); diff --git a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java index 7ef6e0d..2f2e19e 100644 --- a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java +++ b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java @@ -84,6 +84,16 @@ public class ScreenWailaConfig extends ScreenBase { "screen.button.no", "screen.button.yes"), "choice.shifttoggledents"); + buttonContainer.addButton( + new ButtonBooleanConfig( + this.getRoot(), + Configuration.CATEGORY_GENERAL, + Constants.CFG_WAILA_SHOWICON, + true, + false, + "screen.button.no", + "screen.button.yes"), + "choice.showicon"); this.getRoot().addWidget("LayoutConfigPos", new LayoutBase(this.getRoot())); this.getRoot().getWidget("LayoutConfigPos") diff --git a/src/main/java/mcp/mobius/waila/overlay/OverlayConfig.java b/src/main/java/mcp/mobius/waila/overlay/OverlayConfig.java index 10e9927..f712217 100644 --- a/src/main/java/mcp/mobius/waila/overlay/OverlayConfig.java +++ b/src/main/java/mcp/mobius/waila/overlay/OverlayConfig.java @@ -18,7 +18,7 @@ public class OverlayConfig { // spotless:off public static void updateColors() { - alpha = (int) (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_ALPHA, 0) / 100.0f * 256) << 24; + alpha = (int) (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_ALPHA, 0) / 100.0f * 255f) << 24; bgcolor = alpha + ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_BGCOLOR, 0); gradient1 = alpha + ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT1, 0); gradient2 = alpha + ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_GRADIENT2, 0); diff --git a/src/main/java/mcp/mobius/waila/overlay/Tooltip.java b/src/main/java/mcp/mobius/waila/overlay/Tooltip.java index 5475d66..cdd5f3d 100644 --- a/src/main/java/mcp/mobius/waila/overlay/Tooltip.java +++ b/src/main/java/mcp/mobius/waila/overlay/Tooltip.java @@ -106,6 +106,8 @@ public class Tooltip { public Tooltip(List textData, boolean hasIcon) { + if (hasIcon) hasIcon = ConfigHandler.instance().showIcon(); + columnsWidth.add(0); // Small init of the arrays to have at least one element columnsPos.add(0); diff --git a/src/main/java/mcp/mobius/waila/utils/Constants.java b/src/main/java/mcp/mobius/waila/utils/Constants.java index 53a348d..72a25fd 100644 --- a/src/main/java/mcp/mobius/waila/utils/Constants.java +++ b/src/main/java/mcp/mobius/waila/utils/Constants.java @@ -19,6 +19,7 @@ public final class Constants { public static String CFG_WAILA_LIQUID = "waila.cfg.liquid"; public static String CFG_WAILA_METADATA = "waila.cfg.metadata"; public static String CFG_WAILA_KEYBIND = "waila.cfg.keybind"; + public static String CFG_WAILA_SHOWICON = "waila.cfg.showicon"; public static String CFG_WAILA_POSX = "waila.cfg.posx"; public static String CFG_WAILA_POSY = "waila.cfg.posy"; public static String CFG_WAILA_SCALE = "waila.cfg.scale"; diff --git a/src/main/resources/assets/waila/lang/en_US.lang b/src/main/resources/assets/waila/lang/en_US.lang index bee705e..32cb2d6 100644 --- a/src/main/resources/assets/waila/lang/en_US.lang +++ b/src/main/resources/assets/waila/lang/en_US.lang @@ -20,6 +20,7 @@ choice.toggledmaintained=Toggled/Maintained choice.showliquids=Liquids choice.shifttoggledblock=Sneak toggle blocks choice.shifttoggledents=Sneak toggle entities +choice.showicon=Show/Hide Icon screen.button.configureaspect=Configure aspect... enchant.title.name=Name