RepoMirrors
/
kami-blue
mirror of https://github.com/kami-blue/client
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'UrM0ther-feature/master' into feature/master

This commit is contained in:
S-B99 2020-03-03 20:34:57 -05:00
parent 2c2f64ac01 4c38751f2e
commit fa935f215f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/me/zeroeightsix/kami/module/modules/combat/CrystalAura.java
View File

@ -53,6 +53,7 @@ public class CrystalAura extends Module {
private Setting<Boolean> place = register(Settings.b("Place", false)); private Setting<Boolean> place = register(Settings.b("Place", false));
private Setting<Boolean> explode = register(Settings.b("Explode", false)); private Setting<Boolean> explode = register(Settings.b("Explode", false));
private Setting<Double> range = register(Settings.d("Range", 4.0)); private Setting<Double> range = register(Settings.d("Range", 4.0));
private Setting<Boolean> tracer = register(Settings.b("Tracer", true));
private Setting<Boolean> antiWeakness = register(Settings.b("Anti Weakness", false)); private Setting<Boolean> antiWeakness = register(Settings.b("Anti Weakness", false));
private Setting<Boolean> checkAbsorption = register(Settings.b("Check Absorption", true)); private Setting<Boolean> checkAbsorption = register(Settings.b("Check Absorption", true));
@ -243,7 +244,7 @@ public class CrystalAura extends Module {
KamiTessellator.prepare(GL11.GL_QUADS); KamiTessellator.prepare(GL11.GL_QUADS);
KamiTessellator.drawBox(render, 0x44ffffff, GeometryMasks.Quad.ALL); KamiTessellator.drawBox(render, 0x44ffffff, GeometryMasks.Quad.ALL);
KamiTessellator.release(); KamiTessellator.release();
if (renderEnt != null) { if (renderEnt != null && tracer.getValue()) {
Vec3d p = EntityUtil.getInterpolatedRenderPos(renderEnt, mc.getRenderPartialTicks()); Vec3d p = EntityUtil.getInterpolatedRenderPos(renderEnt, mc.getRenderPartialTicks());
Tracers.drawLineFromPosToPos(render.x - mc.getRenderManager().renderPosX + .5d, render.y - mc.getRenderManager().renderPosY + 1, render.z - mc.getRenderManager().renderPosZ + .5d, p.x, p.y, p.z, renderEnt.getEyeHeight(), 1, 1, 1, 1); Tracers.drawLineFromPosToPos(render.x - mc.getRenderManager().renderPosX + .5d, render.y - mc.getRenderManager().renderPosY + 1, render.z - mc.getRenderManager().renderPosZ + .5d, p.x, p.y, p.z, renderEnt.getEyeHeight(), 1, 1, 1, 1);
} }

2
src/main/java/me/zeroeightsix/kami/module/modules/render/Tracers.java
View File

@ -139,7 +139,6 @@ public class Tracers extends Module {
public static void drawLineFromPosToPos(double posx, double posy, double posz, double posx2, double posy2, double posz2, double up, float red, float green, float blue, float opacity) { public static void drawLineFromPosToPos(double posx, double posy, double posz, double posx2, double posy2, double posz2, double up, float red, float green, float blue, float opacity) {
GL11.glBlendFunc(770, 771); GL11.glBlendFunc(770, 771);
GL11.glEnable(GL11.GL_BLEND);
GL11.glLineWidth(1.5f); GL11.glLineWidth(1.5f);
GL11.glDisable(GL11.GL_TEXTURE_2D); GL11.glDisable(GL11.GL_TEXTURE_2D);
GL11.glDisable(GL11.GL_DEPTH_TEST); GL11.glDisable(GL11.GL_DEPTH_TEST);
@ -161,7 +160,6 @@ public class Tracers extends Module {
GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glEnable(GL11.GL_TEXTURE_2D);
GL11.glEnable(GL11.GL_DEPTH_TEST); GL11.glEnable(GL11.GL_DEPTH_TEST);
GL11.glDepthMask(true); GL11.glDepthMask(true);
GL11.glDisable(GL11.GL_BLEND);
GL11.glColor3d(1d, 1d, 1d); GL11.glColor3d(1d, 1d, 1d);
GlStateManager.enableLighting(); GlStateManager.enableLighting();
} }