Skip to content

Commit

Permalink
Merge branch 'master' into 25w08a
Browse files Browse the repository at this point in the history
  • Loading branch information
@Alexander01998
Alexander01998 committed Feb 20, 2025
2 parents febcad1 + a5a7ea0 commit 851fa2c
Show file tree
Hide file tree
Showing 6 changed files with 136 additions and 276 deletions.
91 changes: 66 additions & 25 deletions src/main/java/net/wurstclient/hacks/ChestEspHack.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,34 @@
import java.util.List;
import java.util.stream.Collectors;

import org.lwjgl.opengl.GL11;

import com.mojang.blaze3d.platform.GlConst;
import com.mojang.blaze3d.systems.RenderSystem;

import net.minecraft.block.entity.*;
import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.Entity;
import net.minecraft.entity.vehicle.ChestBoatEntity;
import net.minecraft.entity.vehicle.ChestMinecartEntity;
import net.minecraft.entity.vehicle.HopperMinecartEntity;
import net.minecraft.util.math.Box;
import net.minecraft.util.math.Vec3d;
import net.wurstclient.Category;
import net.wurstclient.WurstRenderLayers;
import net.wurstclient.events.CameraTransformViewBobbingListener;
import net.wurstclient.events.RenderListener;
import net.wurstclient.events.UpdateListener;
import net.wurstclient.hack.Hack;
import net.wurstclient.hacks.chestesp.ChestEspBlockGroup;
import net.wurstclient.hacks.chestesp.ChestEspEntityGroup;
import net.wurstclient.hacks.chestesp.ChestEspGroup;
import net.wurstclient.hacks.chestesp.ChestEspRenderer;
import net.wurstclient.settings.CheckboxSetting;
import net.wurstclient.settings.ColorSetting;
import net.wurstclient.settings.EspStyleSetting;
import net.wurstclient.util.RegionPos;
import net.wurstclient.util.RenderUtils;
import net.wurstclient.util.RotationUtils;
import net.wurstclient.util.chunk.ChunkUtils;

public class ChestEspHack extends Hack implements UpdateListener,
Expand Down Expand Up @@ -145,8 +150,6 @@ protected void onEnable()
EVENTS.add(UpdateListener.class, this);
EVENTS.add(CameraTransformViewBobbingListener.class, this);
EVENTS.add(RenderListener.class, this);

ChestEspRenderer.prepareBuffers();
}

@Override
Expand All @@ -157,7 +160,6 @@ protected void onDisable()
EVENTS.remove(RenderListener.class, this);

groups.forEach(ChestEspGroup::clear);
ChestEspRenderer.closeBuffers();
}

@Override
Expand Down Expand Up @@ -213,36 +215,75 @@ public void onCameraTransformViewBobbing(
@Override
public void onRender(MatrixStack matrixStack, float partialTicks)
{
// GL settings
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glDisable(GL11.GL_DEPTH_TEST);
RenderSystem.depthFunc(GlConst.GL_ALWAYS);
VertexConsumerProvider.Immediate vcp =
MC.getBufferBuilders().getEntityVertexConsumers();

matrixStack.push();
RenderUtils.applyRegionalRenderOffset(matrixStack);
RegionPos region = RenderUtils.getCameraRegion();
RenderUtils.applyRegionalRenderOffset(matrixStack, region);

entityGroups.stream().filter(ChestEspGroup::isEnabled)
.forEach(g -> g.updateBoxes(partialTicks));

ChestEspRenderer espRenderer =
new ChestEspRenderer(matrixStack, partialTicks);

if(style.hasBoxes())
// RenderSystem.setShader(ShaderProgramKeys.POSITION);
groups.stream().filter(ChestEspGroup::isEnabled)
.forEach(espRenderer::renderBoxes);
renderBoxes(matrixStack, vcp, partialTicks, region);

if(style.hasLines())
// RenderSystem.setShader(ShaderProgramKeys.POSITION);
groups.stream().filter(ChestEspGroup::isEnabled)
.forEach(espRenderer::renderLines);
renderTracers(matrixStack, vcp, partialTicks, region);

matrixStack.pop();

// GL resets
RenderSystem.setShaderColor(1, 1, 1, 1);
GL11.glEnable(GL11.GL_DEPTH_TEST);
GL11.glDisable(GL11.GL_BLEND);
vcp.draw(WurstRenderLayers.ESP_QUADS);
vcp.draw(WurstRenderLayers.ESP_LINES);
}

private void renderBoxes(MatrixStack matrixStack,
VertexConsumerProvider vcp, float partialTicks, RegionPos region)
{
Vec3d offset = region.negate().toVec3d();

for(ChestEspGroup group : groups)
{
if(!group.isEnabled())
return;

List<Box> boxes = group.getBoxes().stream()
.map(box -> box.offset(offset)).toList();

VertexConsumer quadsBuffer =
vcp.getBuffer(WurstRenderLayers.ESP_QUADS);
int quadsColor = group.getColorI(0x40);
for(Box box : boxes)
RenderUtils.drawSolidBox(matrixStack, quadsBuffer, box,
quadsColor);

VertexConsumer linesBuffer =
vcp.getBuffer(WurstRenderLayers.ESP_LINES);
int linesColor = group.getColorI(0x80);
for(Box box : boxes)
RenderUtils.drawOutlinedBox(matrixStack, linesBuffer, box,
linesColor);
}
}

private void renderTracers(MatrixStack matrixStack,
VertexConsumerProvider vcp, float partialTicks, RegionPos region)
{
Vec3d offset = region.negate().toVec3d();
Vec3d start = RotationUtils.getClientLookVec(partialTicks)
.add(RenderUtils.getCameraPos()).add(offset);

VertexConsumer buffer = vcp.getBuffer(WurstRenderLayers.ESP_LINES);
for(ChestEspGroup group : groups)
{
if(!group.isEnabled())
return;

int color = group.getColorI(0x80);
for(Box box : group.getBoxes())
RenderUtils.drawLine(matrixStack, buffer, start,
box.getCenter().add(offset), color);
}
}
}
91 changes: 66 additions & 25 deletions src/main/java/net/wurstclient/hacks/PortalEspHack.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,32 @@
import java.util.List;
import java.util.function.BiPredicate;

import org.lwjgl.opengl.GL11;

import com.mojang.blaze3d.platform.GlConst;
import com.mojang.blaze3d.systems.RenderSystem;

import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Box;
import net.minecraft.util.math.Vec3d;
import net.wurstclient.Category;
import net.wurstclient.WurstRenderLayers;
import net.wurstclient.events.CameraTransformViewBobbingListener;
import net.wurstclient.events.PacketInputListener;
import net.wurstclient.events.RenderListener;
import net.wurstclient.events.UpdateListener;
import net.wurstclient.hack.Hack;
import net.wurstclient.hacks.portalesp.PortalEspBlockGroup;
import net.wurstclient.hacks.portalesp.PortalEspRenderer;
import net.wurstclient.settings.CheckboxSetting;
import net.wurstclient.settings.ChunkAreaSetting;
import net.wurstclient.settings.ColorSetting;
import net.wurstclient.settings.EspStyleSetting;
import net.wurstclient.util.RegionPos;
import net.wurstclient.util.RenderUtils;
import net.wurstclient.util.RotationUtils;
import net.wurstclient.util.chunk.ChunkSearcher.Result;
import net.wurstclient.util.chunk.ChunkSearcherCoordinator;

Expand Down Expand Up @@ -103,8 +108,6 @@ protected void onEnable()
EVENTS.add(PacketInputListener.class, coordinator);
EVENTS.add(CameraTransformViewBobbingListener.class, this);
EVENTS.add(RenderListener.class, this);

PortalEspRenderer.prepareBuffers();
}

@Override
Expand All @@ -117,7 +120,6 @@ protected void onDisable()

coordinator.reset();
groups.forEach(PortalEspBlockGroup::clear);
PortalEspRenderer.closeBuffers();
}

@Override
Expand All @@ -142,34 +144,73 @@ public void onUpdate()
@Override
public void onRender(MatrixStack matrixStack, float partialTicks)
{
// GL settings
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glDisable(GL11.GL_DEPTH_TEST);
RenderSystem.depthFunc(GlConst.GL_ALWAYS);
VertexConsumerProvider.Immediate vcp =
MC.getBufferBuilders().getEntityVertexConsumers();

matrixStack.push();
RenderUtils.applyRegionalRenderOffset(matrixStack);

PortalEspRenderer espRenderer =
new PortalEspRenderer(matrixStack, partialTicks);
RegionPos region = RenderUtils.getCameraRegion();
RenderUtils.applyRegionalRenderOffset(matrixStack, region);

if(style.getSelected().hasBoxes())
// RenderSystem.setShader(ShaderProgramKeys.POSITION);
groups.stream().filter(PortalEspBlockGroup::isEnabled)
.forEach(espRenderer::renderBoxes);
renderBoxes(matrixStack, vcp, partialTicks, region);

if(style.getSelected().hasLines())
// RenderSystem.setShader(ShaderProgramKeys.POSITION);
groups.stream().filter(PortalEspBlockGroup::isEnabled)
.forEach(espRenderer::renderLines);
renderTracers(matrixStack, vcp, partialTicks, region);

matrixStack.pop();

// GL resets
RenderSystem.setShaderColor(1, 1, 1, 1);
GL11.glEnable(GL11.GL_DEPTH_TEST);
GL11.glDisable(GL11.GL_BLEND);
vcp.draw(WurstRenderLayers.ESP_QUADS);
vcp.draw(WurstRenderLayers.ESP_LINES);
}

private void renderBoxes(MatrixStack matrixStack,
VertexConsumerProvider vcp, float partialTicks, RegionPos region)
{
Vec3d offset = region.negate().toVec3d();

for(PortalEspBlockGroup group : groups)
{
if(!group.isEnabled())
return;

List<Box> boxes = group.getBoxes().stream()
.map(box -> box.offset(offset)).toList();

VertexConsumer quadsBuffer =
vcp.getBuffer(WurstRenderLayers.ESP_QUADS);
int quadsColor = group.getColorI(0x40);
for(Box box : boxes)
RenderUtils.drawSolidBox(matrixStack, quadsBuffer, box,
quadsColor);

VertexConsumer linesBuffer =
vcp.getBuffer(WurstRenderLayers.ESP_LINES);
int linesColor = group.getColorI(0x80);
for(Box box : boxes)
RenderUtils.drawOutlinedBox(matrixStack, linesBuffer, box,
linesColor);
}
}

private void renderTracers(MatrixStack matrixStack,
VertexConsumerProvider vcp, float partialTicks, RegionPos region)
{
Vec3d offset = region.negate().toVec3d();
Vec3d start = RotationUtils.getClientLookVec(partialTicks)
.add(RenderUtils.getCameraPos()).add(offset);

VertexConsumer buffer = vcp.getBuffer(WurstRenderLayers.ESP_LINES);
for(PortalEspBlockGroup group : groups)
{
if(!group.isEnabled())
return;

int color = group.getColorI(0x80);
for(Box box : group.getBoxes())
RenderUtils.drawLine(matrixStack, buffer, start,
box.getCenter().add(offset), color);
}
}

private void updateGroupBoxes()
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/wurstclient/hacks/chestesp/ChestEspGroup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ public Stream<Setting> getSettings()
return Stream.of(enabled, color).filter(Objects::nonNull);
}

public float[] getColorF()
public int getColorI(int alpha)
{
return color.getColorF();
return color.getColorI(alpha);
}

public List<Box> getBoxes()
Expand Down
Loading

0 comments on commit 851fa2c

Please sign in to comment.