Skip to content

Fix NearestEntityFrameComponent #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nothub wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix NearestEntityFrameComponent #300

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f7ff4c
NearestEntityFrameComponent fix types
nothub Jul 5, 2020
1e5c554
NearestEntityFrameComponent fix empty background
nothub Jul 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/main/java/me/ionar/salhack/gui/hud/components/NearestEntityFrameComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.monster.EntityEnderman;
import net.minecraft.entity.monster.EntityPigZombie;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.passive.*;
import net.minecraft.entity.player.EntityPlayer;

public class NearestEntityFrameComponent extends HudComponentItem
Expand All @@ -34,11 +35,6 @@ public void render(int p_MouseX, int p_MouseY, float p_PartialTicks)
{
super.render(p_MouseX, p_MouseY, p_PartialTicks);

//RenderUtil.drawStringWithShadow(mc.getSession().getUsername(), GetX(), GetY(), 0xFFFFFF);

RenderUtil.drawRect(GetX(), GetY(), GetX()+GetWidth(), GetY()+GetHeight(), 0x990C0C0C);
//RenderUtil.drawStringWithShadow(mc.getSession().getUsername(), GetX(), GetY(), 0xFFEC00);

EntityLivingBase l_Entity = mc.world.loadedEntityList.stream()
.filter(entity -> IsValidEntity(entity))
.map(entity -> (EntityLivingBase) entity)
Expand All @@ -48,6 +44,11 @@ public void render(int p_MouseX, int p_MouseY, float p_PartialTicks)
if (l_Entity == null)
return;

//RenderUtil.drawStringWithShadow(mc.getSession().getUsername(), GetX(), GetY(), 0xFFFFFF);

RenderUtil.drawRect(GetX(), GetY(), GetX()+GetWidth(), GetY()+GetHeight(), 0x990C0C0C);
//RenderUtil.drawStringWithShadow(mc.getSession().getUsername(), GetX(), GetY(), 0xFFEC00);

float l_HealthPct = ((l_Entity.getHealth()+l_Entity.getAbsorptionAmount())/l_Entity.getMaxHealth())*100.0f ;
float l_HealthBarPct = Math.min(l_HealthPct, 100.0f);

Expand Down Expand Up @@ -92,10 +93,10 @@ private boolean IsValidEntity(Entity p_Entity)
return false;
}

if (EntityUtil.isHostileMob(p_Entity) && !Mobs.getValue() || (p_Entity instanceof EntityPigZombie && !Mobs.getValue()))
if (!Mobs.getValue() && (EntityUtil.isHostileMob(p_Entity) || (p_Entity instanceof EntityPigZombie) || (p_Entity instanceof EntityEnderman)))
return false;

if (p_Entity instanceof EntityAnimal && !Animals.getValue())
if (!Animals.getValue() && (p_Entity instanceof EntityAnimal || p_Entity instanceof EntityAmbientCreature || p_Entity instanceof EntitySquid))
return false;

return true;
Expand Down