caskd
/
seppuku
forked from RepoMirrors/seppuku
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Portal Finder show distance both 2d & 3d, new render utils

This commit is contained in:
noil 2019-11-04 10:21:07 -05:00
parent 5bfc932228
commit 291541f465
2 changed files with 56 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/me/rigamortis/seppuku/api/util/RenderUtil.java
View File

@ -7,6 +7,7 @@ import net.minecraft.client.renderer.GLAllocation;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.math.AxisAlignedBB;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL32;
@ -337,6 +338,24 @@ public final class RenderUtil {
GL11.glScissor((int) (x * sr.getScaleFactor()), (int) (Minecraft.getMinecraft().displayHeight - (y1 * sr.getScaleFactor())), (int) ((x1 - x) * sr.getScaleFactor()), (int) ((y1 - y) * sr.getScaleFactor()));
}
public static void glBillboard(float x, float y, float z) {
float scale = 0.016666668f * 1.6f;
GlStateManager.translate(x - Minecraft.getMinecraft().getRenderManager().renderPosX, y - Minecraft.getMinecraft().getRenderManager().renderPosY, z - Minecraft.getMinecraft().getRenderManager().renderPosZ);
GlStateManager.glNormal3f(0.0f, 1.0f, 0.0f);
GlStateManager.rotate(-Minecraft.getMinecraft().player.rotationYaw, 0.0f, 1.0f, 0.0f);
GlStateManager.rotate(Minecraft.getMinecraft().player.rotationPitch, Minecraft.getMinecraft().gameSettings.thirdPersonView == 2 ? -1.0f : 1.0f, 0.0f, 0.0f);
GlStateManager.scale(-scale, -scale, scale);
}
public static void glBillboardDistanceScaled(float x, float y, float z, EntityPlayer player, float scale) {
glBillboard(x, y, z);
int distance = (int) player.getDistance(x, y, z);
float scaleDistance = (distance / 2.0f) / (2.0f + (2.0f - scale));
if (scaleDistance < 1f)
scaleDistance = 1;
GlStateManager.scale(scaleDistance, scaleDistance, scaleDistance);
}
public static void drawTexturedModalRect(float x, float y, float textureX, float textureY, float width, float height) {
float f = 0.00390625F;
float f1 = 0.00390625F;

44
src/main/java/me/rigamortis/seppuku/impl/module/render/PortalFinderModule.java
View File

@ -15,6 +15,7 @@ import me.rigamortis.seppuku.api.value.NumberValue;
import me.rigamortis.seppuku.api.value.OptionalValue;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.init.Blocks;
import net.minecraft.network.play.server.SPacketJoinGame;
import net.minecraft.util.math.BlockPos;
@ -39,8 +40,11 @@ public final class PortalFinderModule extends Module {
public final BooleanValue chat = new BooleanValue("Chat", new String[]{"Chat", "ChatMessages", "ChatNotifications"}, true);
public final BooleanValue remove = new BooleanValue("Remove", new String[]{"R", "Delete"}, true);
public final NumberValue<Integer> range = new NumberValue<Integer>("Range", new String[]{"R", "Distance"}, 200, Integer.class, 1, 2000, 1);
public final NumberValue<Float> width = new NumberValue<Float>("Width", new String[]{"W", "Width"}, 0.5f, Float.class, 0.0f, 5.0f, 0.1f);
public final BooleanValue showInfo = new BooleanValue("ShowInfo", new String[]{"SI", "DrawInfo", "DrawText"}, true);
public final NumberValue<Float> infoScale = new NumberValue<Float>("InfoScale", new String[]{"IS", "Scale", "TextScale"}, 1.0f, Float.class, 0.0f, 3.0f, 0.25f);
public final NumberValue<Float> width = new NumberValue<Float>("Width", new String[]{"W", "Width"}, 0.5f, Float.class, 0.0f, 5.0f, 0.1f);
public final NumberValue<Float> red = new NumberValue<Float>("Red", new String[]{"R"}, 255.0f, Float.class, 0.0f, 255.0f, 1.0f);
public final NumberValue<Float> green = new NumberValue<Float>("Green", new String[]{"G"}, 255.0f, Float.class, 0.0f, 255.0f, 1.0f);
public final NumberValue<Float> blue = new NumberValue<Float>("Blue", new String[]{"B"}, 255.0f, Float.class, 0.0f, 255.0f, 1.0f);
@ -68,6 +72,14 @@ public final class PortalFinderModule extends Module {
final GLUProjection.Projection projection = GLUProjection.getInstance().project(portal.x - mc.getRenderManager().viewerPosX, portal.y - mc.getRenderManager().viewerPosY, portal.z - mc.getRenderManager().viewerPosZ, GLUProjection.ClampMode.NONE, true);
if (projection != null) {
RenderUtil.drawLine((float) projection.getX(), (float) projection.getY(), event.getScaledResolution().getScaledWidth() / 2, event.getScaledResolution().getScaledHeight() / 2, this.width.getFloat(), new Color(red.getFloat() / 255.0f, green.getFloat() / 255.0f, blue.getFloat() / 255.0f).getRGB());
if (this.showInfo.getBoolean()) {
final float scale = this.infoScale.getFloat();
GlStateManager.pushMatrix();
GlStateManager.scale(scale, scale, scale);
this.drawPortalInfoText(portal, (float) projection.getX() / scale, (float) projection.getY() / scale);
GlStateManager.scale(-scale, -scale, -scale);
GlStateManager.popMatrix();
}
}
}
}
@ -79,13 +91,27 @@ public final class PortalFinderModule extends Module {
final Minecraft mc = Minecraft.getMinecraft();
for (Vec3d portal : this.portals) {
GlStateManager.pushMatrix();
final boolean bobbing = mc.gameSettings.viewBobbing;
mc.gameSettings.viewBobbing = false;
mc.entityRenderer.setupCameraTransform(event.getPartialTicks(), 0);
final Vec3d forward = new Vec3d(0, 0, 1).rotatePitch(-(float) Math.toRadians(Minecraft.getMinecraft().player.rotationPitch)).rotateYaw(-(float) Math.toRadians(Minecraft.getMinecraft().player.rotationYaw));
// Line
RenderUtil.drawLine3D((float) forward.x, (float) forward.y + mc.player.getEyeHeight(), (float) forward.z, (float) (portal.x - mc.getRenderManager().renderPosX), (float) (portal.y - mc.getRenderManager().renderPosY), (float) (portal.z - mc.getRenderManager().renderPosZ), this.width.getFloat(), new Color(red.getFloat() / 255.0f, green.getFloat() / 255.0f, blue.getFloat() / 255.0f).getRGB());
// Info
if (this.showInfo.getBoolean()) {
RenderUtil.glBillboardDistanceScaled((float) portal.x, (float) portal.y, (float) portal.z, mc.player, this.infoScale.getFloat());
GlStateManager.disableDepth();
this.drawPortalInfoText(portal, 0, 0);
GlStateManager.enableDepth();
}
mc.gameSettings.viewBobbing = bobbing;
mc.entityRenderer.setupCameraTransform(event.getPartialTicks(), 0);
GlStateManager.popMatrix();
}
}
}
@ -154,21 +180,21 @@ public final class PortalFinderModule extends Module {
return false;
}
private void printPortalToChat(Vec3d position) {
private void printPortalToChat(Vec3d portal) {
final TextComponentString portalTextComponent = new TextComponentString("Portal found!");
String overworld = "";
String nether = "";
if (Minecraft.getMinecraft().player.dimension == 0) { // overworld
overworld = String.format("Overworld: X: %s, Y: %s, Z: %s", position.x, position.y, position.z);
nether = String.format("Nether: X: %s, Y: %s, Z: %s", position.x / 8, position.y, position.z / 8);
overworld = String.format("Overworld: X: %s, Y: %s, Z: %s", (int) portal.x, (int) portal.y, (int) portal.z);
nether = String.format("Nether: X: %s, Y: %s, Z: %s", (int) portal.x / 8, (int) portal.y, (int) portal.z / 8);
} else if (Minecraft.getMinecraft().player.dimension == -1) { // nether
overworld = String.format("Overworld: X: %s, Y: %s, Z: %s", position.x * 8, position.y, position.z * 8);
nether = String.format("Nether: X: %s, Y: %s, Z: %s", position.x, position.y, position.z);
overworld = String.format("Overworld: X: %s, Y: %s, Z: %s", (int) portal.x * 8, (int) portal.y, (int) portal.z * 8);
nether = String.format("Nether: X: %s, Y: %s, Z: %s", (int) portal.x, (int) portal.y, (int) portal.z);
}
int playerDistance = (int) Minecraft.getMinecraft().player.getDistance(position.x, position.y, position.z);
int playerDistance = (int) Minecraft.getMinecraft().player.getDistance(portal.x, portal.y, portal.z);
String distance = ChatFormatting.GRAY + "" + playerDistance + "m away";
String hoverText = overworld + "\n" + nether + "\n" + distance;
@ -177,6 +203,10 @@ public final class PortalFinderModule extends Module {
Seppuku.INSTANCE.logcChat(portalTextComponent);
}
private void drawPortalInfoText(Vec3d portal, float x, float y) {
Minecraft.getMinecraft().fontRenderer.drawStringWithShadow((int) Minecraft.getMinecraft().player.getDistance(portal.x, portal.y, portal.z) + "m", x, y, 0xFFAAAAAA);
}
public List<Vec3d> getPortals() {
return portals;
}