From 1eb78112ebc838886428ea67e055a3e8d775e5a2 Mon Sep 17 00:00:00 2001 From: Thomas Guimbretiere Date: Sun, 12 Jul 2015 18:29:28 +0200 Subject: [PATCH] Added a config option (in Modules/General) to turn on/off the display of entity tooltips. It is located there so it can be enforced server side if required (for pvp, etc). Fixes issue #196 --- src/main/java/mcp/mobius/waila/client/ProxyClient.java | 3 ++- src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java | 2 +- src/main/resources/assets/waila/lang/en_US.lang | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/mcp/mobius/waila/client/ProxyClient.java b/src/main/java/mcp/mobius/waila/client/ProxyClient.java index 7270e90..118e81b 100644 --- a/src/main/java/mcp/mobius/waila/client/ProxyClient.java +++ b/src/main/java/mcp/mobius/waila/client/ProxyClient.java @@ -57,7 +57,8 @@ public class ProxyClient extends ProxyServer { ModuleRegistrar.instance().registerTailProvider(new HUDHandlerEntities(), Entity.class); //ModuleRegistrar.instance().registerShortDataProvider(new SummaryProviderDefault(), Item.class); - + + ModuleRegistrar.instance().addConfig("General", "general.showents"); ModuleRegistrar.instance().addConfig("General", "general.showhp"); ModuleRegistrar.instance().addConfig("General", "general.showcrop"); diff --git a/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java b/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java index 3bff09f..7e75502 100644 --- a/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java +++ b/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java @@ -40,7 +40,7 @@ public class OverlayRenderer { renderOverlay(WailaTickHandler.instance().tooltip); } - if (RayTracing.instance().getTarget().typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY) + if (RayTracing.instance().getTarget().typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY && ConfigHandler.instance().getConfig("general.showents")) { renderOverlay(WailaTickHandler.instance().tooltip); } diff --git a/src/main/resources/assets/waila/lang/en_US.lang b/src/main/resources/assets/waila/lang/en_US.lang index 1318b9d..0cfe7aa 100644 --- a/src/main/resources/assets/waila/lang/en_US.lang +++ b/src/main/resources/assets/waila/lang/en_US.lang @@ -143,6 +143,7 @@ option.carpenters.hide=Hide camo blocks option.stevescarts.showall=Show data option.stevescarts.colorblind=Colorblind mode option.stevescarts.shifttoggle=Shift toggle +option.general.showents=Show entities option.general.showhp=Show entities health option.general.showcrop=Show crop growth option.thaumcraft.aspects=Show aspects \ No newline at end of file