diff --git a/src/main/java/mcp/mobius/waila/Waila.java b/src/main/java/mcp/mobius/waila/Waila.java index 5f98ec4..2b6a6e1 100644 --- a/src/main/java/mcp/mobius/waila/Waila.java +++ b/src/main/java/mcp/mobius/waila/Waila.java @@ -1,6 +1,7 @@ package mcp.mobius.waila; import java.lang.reflect.Field; +import java.util.Map; import net.minecraftforge.common.MinecraftForge; @@ -23,6 +24,9 @@ import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; +import cpw.mods.fml.common.network.NetworkCheckHandler; +import cpw.mods.fml.common.versioning.ArtifactVersion; +import cpw.mods.fml.common.versioning.DefaultArtifactVersion; import cpw.mods.fml.relauncher.Side; import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.api.impl.ModuleRegistrar; @@ -52,6 +56,7 @@ public class Waila { public static ProxyServer proxy; public static Logger log = LogManager.getLogger("Waila"); public boolean serverPresent = false; + private final ArtifactVersion minimumClientJoinVersion = new DefaultArtifactVersion("1.7.3"); /* INIT SEQUENCE */ @EventHandler @@ -130,4 +135,16 @@ public class Waila { public void serverStarting(FMLServerStartingEvent event) { event.registerServerCommand(new CommandDumpHandlers()); } + + /** + * Block any clients older than 1.7.3 to ensure the vanilla.show_invisible_players property is respected + */ + @SuppressWarnings("unused") + @NetworkCheckHandler + public boolean checkModList(Map versions, Side side) { + if (side == Side.CLIENT && versions.containsKey("Waila")) { + return minimumClientJoinVersion.compareTo(new DefaultArtifactVersion(versions.get("Waila"))) <= 0; + } + return true; + } } diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java index fea15c4..81a5da6 100644 --- a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java @@ -235,6 +235,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider { ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.redstone"); ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.silverfish"); ModuleRegistrar.instance().addConfigRemote("VanillaMC", "vanilla.jukebox"); + ModuleRegistrar.instance().addConfigRemote("VanillaMC", "vanilla.show_invisible_players"); IWailaDataProvider provider = new HUDHandlerVanilla(); diff --git a/src/main/java/mcp/mobius/waila/overlay/RayTracing.java b/src/main/java/mcp/mobius/waila/overlay/RayTracing.java index 50aed1f..175010f 100644 --- a/src/main/java/mcp/mobius/waila/overlay/RayTracing.java +++ b/src/main/java/mcp/mobius/waila/overlay/RayTracing.java @@ -7,6 +7,7 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -38,8 +39,8 @@ public class RayTracing { private final Minecraft mc = Minecraft.getMinecraft(); public void fire() { - if (mc.objectMouseOver != null - && mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY) { + if (mc.objectMouseOver != null && mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY + && !shouldHidePlayer(mc.objectMouseOver.entityHit)) { this.target = mc.objectMouseOver; return; } @@ -50,6 +51,15 @@ public class RayTracing { this.target = this.rayTrace(viewpoint, mc.playerController.getBlockReachDistance(), 0); } + private static boolean shouldHidePlayer(Entity targetEnt) { + // Check if entity is player with invisibility effect + if (targetEnt instanceof EntityPlayer thePlayer) { + boolean shouldHidePlayerSetting = !ConfigHandler.instance().getConfig("vanilla.show_invisible_players"); + return shouldHidePlayerSetting && thePlayer.isInvisible(); + } + return false; + } + public MovingObjectPosition getTarget() { return this.target; } @@ -124,7 +134,7 @@ public class RayTracing { .getWailaStack(DataAccessorCommon.instance, ConfigHandler.instance()); if (providerStack != null) { - if (providerStack.getItem() == null) return new ArrayList(); + if (providerStack.getItem() == null) return new ArrayList<>(); items.add(providerStack); } @@ -141,7 +151,7 @@ public class RayTracing { .getWailaStack(DataAccessorCommon.instance, ConfigHandler.instance()); if (providerStack != null) { - if (providerStack.getItem() == null) return new ArrayList(); + if (providerStack.getItem() == null) return new ArrayList<>(); items.add(providerStack); } @@ -165,12 +175,11 @@ public class RayTracing { try { ItemStack pick = mouseoverBlock.getPickBlock(this.target, world, x, y, z); if (pick != null) items.add(pick); - } catch (Exception e) {} + } catch (Exception ignored) {} if (!items.isEmpty()) return items; - if (mouseoverBlock instanceof IShearable) { - IShearable shearable = (IShearable) mouseoverBlock; + if (mouseoverBlock instanceof IShearable shearable) { if (shearable.isShearable(new ItemStack(Items.shears), world, x, y, z)) { items.addAll(shearable.onSheared(new ItemStack(Items.shears), world, x, y, z, 0)); }