mirror/Wurst7
0
0
Fork 0
mirror of https://github.com/Wurst-Imperium/Wurst7.git synced 2024-09-20 09:16:20 +02:00
Code

Merge branch 'master' into v7.38

Browse Source
This commit is contained in:
Alexander01998 2023-10-08 15:32:59 +02:00
commit f424b61f4d
6 changed files with 89 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/wurstclient/hacks/ChestEspHack.java
View File

@ -192,7 +192,7 @@ public class ChestEspHack extends Hack implements UpdateListener,
public void onCameraTransformViewBobbing(
CameraTransformViewBobbingEvent event)
{
if(style.getSelected().hasLines())
if(style.hasLines())
event.cancel();
}
@ -213,14 +213,14 @@ public class ChestEspHack extends Hack implements UpdateListener,
ChestEspRenderer espRenderer = new ChestEspRenderer(matrixStack);
if(style.getSelected().hasBoxes())
if(style.hasBoxes())
{
RenderSystem.setShader(GameRenderer::getPositionProgram);
groups.stream().filter(ChestEspGroup::isEnabled)
.forEach(espRenderer::renderBoxes);
}
if(style.getSelected().hasLines())
if(style.hasLines())
{
RenderSystem.setShader(GameRenderer::getPositionProgram);
groups.stream().filter(ChestEspGroup::isEnabled)

38
src/main/java/net/wurstclient/hacks/ItemEspHack.java
View File

@ -32,7 +32,7 @@ import net.wurstclient.events.RenderListener;
import net.wurstclient.events.UpdateListener;
import net.wurstclient.hack.Hack;
import net.wurstclient.settings.ColorSetting;
import net.wurstclient.settings.EnumSetting;
import net.wurstclient.settings.EspBoxSizeSetting;
import net.wurstclient.settings.EspStyleSetting;
import net.wurstclient.util.EntityUtils;
import net.wurstclient.util.RegionPos;
@ -45,10 +45,9 @@ public final class ItemEspHack extends Hack implements UpdateListener,
{
private final EspStyleSetting style = new EspStyleSetting();
private final EnumSetting<BoxSize> boxSize = new EnumSetting<>("Box size",
private final EspBoxSizeSetting boxSize = new EspBoxSizeSetting(
"\u00a7lAccurate\u00a7r mode shows the exact hitbox of each item.\n"
+ "\u00a7lFancy\u00a7r mode shows larger boxes that look better.",
BoxSize.values(), BoxSize.FANCY);
+ "\u00a7lFancy\u00a7r mode shows larger boxes that look better.");
private final ColorSetting color = new ColorSetting("Color",
"Items will be highlighted in this color.", Color.YELLOW);
@ -94,7 +93,7 @@ public final class ItemEspHack extends Hack implements UpdateListener,
public void onCameraTransformViewBobbing(
CameraTransformViewBobbingEvent event)
{
if(style.getSelected().hasLines())
if(style.hasLines())
event.cancel();
}
@ -111,7 +110,7 @@ public final class ItemEspHack extends Hack implements UpdateListener,
renderBoxes(matrixStack, partialTicks, region);
if(style.getSelected().hasLines())
if(style.hasLines())
renderTracers(matrixStack, partialTicks, region);
matrixStack.pop();
@ -125,7 +124,7 @@ public final class ItemEspHack extends Hack implements UpdateListener,
private void renderBoxes(MatrixStack matrixStack, float partialTicks,
RegionPos region)
{
float extraSize = boxSize.getSelected().extraSize;
float extraSize = boxSize.getExtraSize();
for(ItemEntity e : items)
{
@ -135,7 +134,7 @@ public final class ItemEspHack extends Hack implements UpdateListener,
.subtract(region.toVec3d());
matrixStack.translate(lerpedPos.x, lerpedPos.y, lerpedPos.z);
if(style.getSelected().hasBoxes())
if(style.hasBoxes())
{
matrixStack.push();
matrixStack.scale(e.getWidth() + extraSize,
@ -175,6 +174,7 @@ public final class ItemEspHack extends Hack implements UpdateListener,
bufferBuilder.begin(VertexFormat.DrawMode.DEBUG_LINES,
VertexFormats.POSITION);
for(ItemEntity e : items)
{
Vec3d end = EntityUtils.getLerpedBox(e, partialTicks).getCenter()
@ -187,27 +187,7 @@ public final class ItemEspHack extends Hack implements UpdateListener,
.vertex(matrix, (float)end.x, (float)end.y, (float)end.z)
.next();
}
tessellator.draw();
}
private enum BoxSize
{
ACCURATE("Accurate", 0),
FANCY("Fancy", 0.1F);
private final String name;
private final float extraSize;
private BoxSize(String name, float extraSize)
{
this.name = name;
this.extraSize = extraSize;
}
@Override
public String toString()
{
return name;
}
}
}

36
src/main/java/net/wurstclient/hacks/MobEspHack.java
View File

@ -36,7 +36,7 @@ import net.wurstclient.events.CameraTransformViewBobbingListener;
import net.wurstclient.events.RenderListener;
import net.wurstclient.events.UpdateListener;
import net.wurstclient.hack.Hack;
import net.wurstclient.settings.EnumSetting;
import net.wurstclient.settings.EspBoxSizeSetting;
import net.wurstclient.settings.EspStyleSetting;
import net.wurstclient.settings.filterlists.EntityFilterList;
import net.wurstclient.settings.filterlists.MobEspFilterList;
@ -51,10 +51,9 @@ public final class MobEspHack extends Hack implements UpdateListener,
{
private final EspStyleSetting style = new EspStyleSetting();
private final EnumSetting<BoxSize> boxSize = new EnumSetting<>("Box size",
private final EspBoxSizeSetting boxSize = new EspBoxSizeSetting(
"\u00a7lAccurate\u00a7r mode shows the exact hitbox of each mob.\n"
+ "\u00a7lFancy\u00a7r mode shows slightly larger boxes that look better.",
BoxSize.values(), BoxSize.FANCY);
+ "\u00a7lFancy\u00a7r mode shows slightly larger boxes that look better.");
private final EntityFilterList entityFilters = MobEspFilterList.create();
@ -113,7 +112,7 @@ public final class MobEspHack extends Hack implements UpdateListener,
public void onCameraTransformViewBobbing(
CameraTransformViewBobbingEvent event)
{
if(style.getSelected().hasLines())
if(style.hasLines())
event.cancel();
}
@ -130,10 +129,10 @@ public final class MobEspHack extends Hack implements UpdateListener,
RegionPos region = RenderUtils.getCameraRegion();
RenderUtils.applyRegionalRenderOffset(matrixStack, region);
if(style.getSelected().hasBoxes())
if(style.hasBoxes())
renderBoxes(matrixStack, partialTicks, region);
if(style.getSelected().hasLines())
if(style.hasLines())
renderTracers(matrixStack, partialTicks, region);
matrixStack.pop();
@ -147,7 +146,7 @@ public final class MobEspHack extends Hack implements UpdateListener,
private void renderBoxes(MatrixStack matrixStack, float partialTicks,
RegionPos region)
{
float extraSize = boxSize.getSelected().extraSize;
float extraSize = boxSize.getExtraSize();
RenderSystem.setShader(GameRenderer::getPositionProgram);
for(LivingEntity e : mobs)
@ -212,25 +211,4 @@ public final class MobEspHack extends Hack implements UpdateListener,
tessellator.draw();
}
private enum BoxSize
{
ACCURATE("Accurate", 0),
FANCY("Fancy", 0.1F);
private final String name;
private final float extraSize;
private BoxSize(String name, float extraSize)
{
this.name = name;
this.extraSize = extraSize;
}
@Override
public String toString()
{
return name;
}
}
}

36
src/main/java/net/wurstclient/hacks/PlayerEspHack.java
View File

@ -34,7 +34,7 @@ import net.wurstclient.events.CameraTransformViewBobbingListener;
import net.wurstclient.events.RenderListener;
import net.wurstclient.events.UpdateListener;
import net.wurstclient.hack.Hack;
import net.wurstclient.settings.EnumSetting;
import net.wurstclient.settings.EspBoxSizeSetting;
import net.wurstclient.settings.EspStyleSetting;
import net.wurstclient.settings.EspStyleSetting.EspStyle;
import net.wurstclient.settings.filterlists.EntityFilterList;
@ -53,10 +53,9 @@ public final class PlayerEspHack extends Hack implements UpdateListener,
private final EspStyleSetting style =
new EspStyleSetting(EspStyle.LINES_AND_BOXES);
private final EnumSetting<BoxSize> boxSize = new EnumSetting<>("Box size",
private final EspBoxSizeSetting boxSize = new EspBoxSizeSetting(
"\u00a7lAccurate\u00a7r mode shows the exact hitbox of each player.\n"
+ "\u00a7lFancy\u00a7r mode shows slightly larger boxes that look better.",
BoxSize.values(), BoxSize.FANCY);
+ "\u00a7lFancy\u00a7r mode shows slightly larger boxes that look better.");
private final EntityFilterList entityFilters = new EntityFilterList(
new FilterSleepingSetting("Won't show sleeping players.", false),
@ -112,7 +111,7 @@ public final class PlayerEspHack extends Hack implements UpdateListener,
public void onCameraTransformViewBobbing(
CameraTransformViewBobbingEvent event)
{
if(style.getSelected().hasLines())
if(style.hasLines())
event.cancel();
}
@ -130,10 +129,10 @@ public final class PlayerEspHack extends Hack implements UpdateListener,
RenderUtils.applyRegionalRenderOffset(matrixStack, region);
// draw boxes
if(style.getSelected().hasBoxes())
if(style.hasBoxes())
renderBoxes(matrixStack, partialTicks, region);
if(style.getSelected().hasLines())
if(style.hasLines())
renderTracers(matrixStack, partialTicks, region);
matrixStack.pop();
@ -147,7 +146,7 @@ public final class PlayerEspHack extends Hack implements UpdateListener,
private void renderBoxes(MatrixStack matrixStack, float partialTicks,
RegionPos region)
{
float extraSize = boxSize.getSelected().extraSize;
float extraSize = boxSize.getExtraSize();
for(PlayerEntity e : players)
{
@ -225,25 +224,4 @@ public final class PlayerEspHack extends Hack implements UpdateListener,
tessellator.draw();
}
private enum BoxSize
{
ACCURATE("Accurate", 0),
FANCY("Fancy", 0.1F);
private final String name;
private final float extraSize;
private BoxSize(String name, float extraSize)
{
this.name = name;
this.extraSize = extraSize;
}
@Override
public String toString()
{
return name;
}
}
}

53
src/main/java/net/wurstclient/settings/EspBoxSizeSetting.java Normal file
View File

@ -0,0 +1,53 @@
/*
* Copyright (c) 2014-2023 Wurst-Imperium and contributors.
*
* This source code is subject to the terms of the GNU General Public
* License, version 3. If a copy of the GPL was not distributed with this
* file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt
*/
package net.wurstclient.settings;
public final class EspBoxSizeSetting
extends EnumSetting<EspBoxSizeSetting.BoxSize>
{
public EspBoxSizeSetting(String description)
{
super("Box size", description, BoxSize.values(), BoxSize.FANCY);
}
public EspBoxSizeSetting(String name, String description, BoxSize selected)
{
super(name, description, BoxSize.values(), selected);
}
public float getExtraSize()
{
return getSelected().extraSize;
}
public enum BoxSize
{
ACCURATE("Accurate", 0),
FANCY("Fancy", 0.1F);
private final String name;
private final float extraSize;
private BoxSize(String name, float extraSize)
{
this.name = name;
this.extraSize = extraSize;
}
public float getExtraSize()
{
return extraSize;
}
@Override
public String toString()
{
return name;
}
}
}

10
src/main/java/net/wurstclient/settings/EspStyleSetting.java
View File

@ -24,6 +24,16 @@ public final class EspStyleSetting extends EnumSetting<EspStyleSetting.EspStyle>
super(name, description, EspStyle.values(), selected);
}
public boolean hasBoxes()
{
return getSelected().boxes;
}
public boolean hasLines()
{
return getSelected().lines;
}
public enum EspStyle
{
BOXES("Boxes only", true, false),