Rounded yes

This commit is contained in:
UnknownUser1789 2023-01-28 22:35:43 +00:00
parent bb37c557ec
commit 629aa8439b
10 changed files with 91394 additions and 91292 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -43,18 +43,16 @@ public class RenderModule extends Mod {
} }
} }
private void draggingFix(int mouseX, int mouseY) { public void renderLayout(int mouseX, int mouseY) {
resize();
draw();
if (this.dragging) { if (this.dragging) {
this.x = mouseX + this.lastX; this.x = mouseX + this.lastX;
this.y = mouseY + this.lastY; this.y = mouseY + this.lastY;
if (!Mouse.isButtonDown(0)) this.dragging = false; if (!Mouse.isButtonDown(0)) this.dragging = false;
} }
}
public void renderLayout(int mouseX, int mouseY) {
resize();
draw();
draggingFix(mouseX, mouseY);
boolean hovered = mouseX >= getX() && mouseY >= getY() && mouseX < getX() + getWidth() && mouseY < getY() + this.getHeight(); boolean hovered = mouseX >= getX() && mouseY >= getY() && mouseX < getX() + getWidth() && mouseY < getY() + this.getHeight();
@ -75,6 +73,7 @@ public class RenderModule extends Mod {
} }
} }
} }
} }
public int getX() { public int getX() {

View File

@ -7,7 +7,6 @@ import dev.resent.module.base.Category;
import dev.resent.module.base.RenderModule; import dev.resent.module.base.RenderModule;
import dev.resent.module.setting.BooleanSetting; import dev.resent.module.setting.BooleanSetting;
import dev.resent.util.misc.FuncUtils; import dev.resent.util.misc.FuncUtils;
import net.lax1dude.eaglercraft.v1_8.Keyboard;
public class CPS extends RenderModule { public class CPS extends RenderModule {
@ -26,7 +25,8 @@ public class CPS extends RenderModule {
@Override @Override
public void draw() { public void draw() {
final boolean pressed = Keyboard.isKeyDown(mc.gameSettings.keyBindAttack.keyCode) || Keyboard.isKeyDown(mc.gameSettings.keyBindUseItem.keyCode);
boolean pressed = mc.gameSettings.keyBindAttack.pressed || mc.gameSettings.keyBindUseItem.pressed;
if(pressed != wasPressed){ if(pressed != wasPressed){
lastPressed = System.currentTimeMillis(); lastPressed = System.currentTimeMillis();

View File

@ -3,17 +3,18 @@ package dev.resent.module.impl.hud;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import dev.resent.animation.SimpleAnimation;
import dev.resent.module.base.Category; import dev.resent.module.base.Category;
import dev.resent.module.base.RenderModule; import dev.resent.module.base.RenderModule;
import dev.resent.module.setting.BooleanSetting; import dev.resent.module.setting.BooleanSetting;
import dev.resent.module.setting.ModeSetting; import dev.resent.module.setting.ModeSetting;
import dev.resent.util.misc.FuncUtils; import dev.resent.util.misc.FuncUtils;
import dev.resent.util.render.Color;
import dev.resent.util.render.RainbowUtil; import dev.resent.util.render.RainbowUtil;
import dev.resent.util.render.RenderUtils; import dev.resent.util.render.RenderUtils;
import net.lax1dude.eaglercraft.v1_8.Mouse; import net.lax1dude.eaglercraft.v1_8.Mouse;
import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui;
public class KeyStrokes extends RenderModule{ public class KeyStrokes extends RenderModule{
@ -62,12 +63,26 @@ public class KeyStrokes extends RenderModule{
FuncUtils.removeIf(clicks2, beenRightTime -> beenRightTime + 1200L < rightTime + 200L); FuncUtils.removeIf(clicks2, beenRightTime -> beenRightTime + 1200L < rightTime + 200L);
return this.clicks2.size(); return this.clicks2.size();
} }
public static SimpleAnimation wOpacityAnimation = new SimpleAnimation(0), aOpacityAnimation = new SimpleAnimation(0), dOpacityAnimation = new SimpleAnimation(0), sOpacityAnimation = new SimpleAnimation(0), jumpOpacityAnimation = new SimpleAnimation(0);
@Override @Override
public void draw() { public void draw() {
boolean pressed = mc.gameSettings.keyBindAttack.pressed; boolean pressed = mc.gameSettings.keyBindAttack.pressed;
boolean rpressed = mc.gameSettings.keyBindUseItem.pressed; boolean rpressed = mc.gameSettings.keyBindUseItem.pressed;
boolean wKey = mc.gameSettings.keyBindForward.pressed;
boolean aKey = mc.gameSettings.keyBindLeft.pressed;
boolean dKey = mc.gameSettings.keyBindRight.pressed;
boolean sKey = mc.gameSettings.keyBindBack.pressed;
boolean jumpKey = mc.gameSettings.keyBindJump.pressed;
wOpacityAnimation.setAnimation(wKey ? 0.8f*255 : 0, 14);
aOpacityAnimation.setAnimation(aKey ? 0.8f*255 : 0, 14);
dOpacityAnimation.setAnimation(dKey ? 0.8f*255 : 0, 14);
sOpacityAnimation.setAnimation(sKey ? 0.8f*255 : 0, 14);
jumpOpacityAnimation.setAnimation(jumpKey ? 0.8f*255 : 0, 14);
if (pressed != this.wasPressed) { if (pressed != this.wasPressed) {
this.lastPressed = System.currentTimeMillis(); this.lastPressed = System.currentTimeMillis();
this.wasPressed = pressed; this.wasPressed = pressed;
@ -89,46 +104,46 @@ public class KeyStrokes extends RenderModule{
if (!transparent.getValue()) { if (!transparent.getValue()) {
//W //W
Gui.drawRect(this.x + 30, this.y + 3, this.x + 55, this.y + 25 + 3, RenderUtils.drawRoundedRect(this.x + 30, this.y + 3, this.x + 55, this.y + 25 + 3, 8,
mc.gameSettings.keyBindForward.pressed ? RenderUtils.getColor(gcolor) : RenderUtils.getColor(gcolorp)); wKey ? getColor(gcolor) : getColor(gcolorp));
// S // S
Gui.drawRect(this.x + 30, this.y + 30, this.x + 55, this.y + 55, RenderUtils.drawRoundedRect(this.x + 30, this.y + 30, this.x + 55, this.y + 55, 8,
mc.gameSettings.keyBindBack.pressed ? RenderUtils.getColor(gcolor) : RenderUtils.getColor(gcolorp)); sKey ? getColor(gcolor) : getColor(gcolorp));
// A // A
Gui.drawRect(this.x + 3, this.y + 30, this.x + 25 + 3, this.y + 55, RenderUtils.drawRoundedRect(this.x + 3, this.y + 30, this.x + 25 + 3, this.y + 55, 8,
mc.gameSettings.keyBindLeft.pressed ? RenderUtils.getColor(gcolor) : RenderUtils.getColor(gcolorp)); aKey ? getColor(gcolor) : getColor(gcolorp));
// D // D
Gui.drawRect(this.x + 60 - 3, this.y + 30, this.x + 85 - 3, this.y + 25 + 5 + 25, RenderUtils.drawRoundedRect(this.x + 60 - 3, this.y + 30, this.x + 85 - 3, this.y + 25 + 5 + 25, 8,
mc.gameSettings.keyBindRight.pressed ? RenderUtils.getColor(gcolor) : RenderUtils.getColor(gcolorp)); dKey ? getColor(gcolor) : getColor(gcolorp));
// LMB // LMB
Gui.drawRect(this.x+3, this.y+57, this.x+41, this.y+82, RenderUtils.drawRoundedRect(this.x+3, this.y+57, this.x+41, this.y+82, 8,
mc.gameSettings.keyBindAttack.pressed ? RenderUtils.getColor(gcolor) : RenderUtils.getColor(gcolorp)); pressed ? getColor(gcolor) : getColor(gcolorp));
// RMB // RMB
Gui.drawRect(this.x + 45 - 1, this.y + 60 - 3, this.x + 85 - 3, this.y + 85 - 3, RenderUtils.drawRoundedRect(this.x + 45 - 1, this.y + 60 - 3, this.x + 85 - 3, this.y + 85 - 3, 8,
mc.gameSettings.keyBindUseItem.pressed ? RenderUtils.getColor(gcolor) : RenderUtils.getColor(gcolorp)); rpressed ? getColor(gcolor) : getColor(gcolorp));
// Jump // Jump
if(jump.getValue()) if(jump.getValue())
Gui.drawRect(this.x + 3, this.y+84, this.x+85-3, RenderUtils.drawRoundedRect(this.x + 3, this.y+84, this.x+85-3,
this.y + 105 - 6, mc.gameSettings.keyBindJump.pressed ? RenderUtils.getColor(gcolor) : RenderUtils.getColor(gcolorp)); this.y + 105 - 6, 8, jumpKey ? getColor(gcolor) : getColor(gcolorp));
} }
// Sneak // Sneak
if (sneak.getValue() && !transparent.getValue()) if (sneak.getValue() && !transparent.getValue())
Gui.drawRect(this.x + 3, jump.getValue() ? this.y+102 : this.y+84, this.x+85-3, RenderUtils.drawRoundedRect(this.x + 3, jump.getValue() ? this.y+102 : this.y+84, this.x+85-3,
jump.getValue() ? this.y+120-3 : this.y+105-6, mc.gameSettings.keyBindSneak.pressed ? RenderUtils.getColor(gcolor) : RenderUtils.getColor(gcolorp)); jump.getValue() ? this.y+120-3 : this.y+105-6, mc.gameSettings.keyBindSneak.pressed ? getColor(gcolor) : getColor(gcolorp));
mc.fontRendererObj.drawString("W", this.x+25+5+(25/2-mc.fontRendererObj.getStringWidth("W") + 4), this.y+8+3, chroma.getValue() ? RainbowUtil.getRainbow(4f, 0.8f, 0.85f) : mc.gameSettings.keyBindForward.pressed ? RenderUtils.getColor(colorp) : RenderUtils.getColor(color), tshadow.getValue()); mc.fontRendererObj.drawString("W", this.x+25+5+(25/2-mc.fontRendererObj.getStringWidth("W") + 4), this.y+8+3, chroma.getValue() ? RainbowUtil.getRainbow(4f, 0.8f, 0.85f) : wKey ? getColor(colorp) : getColor(color), tshadow.getValue());
mc.fontRendererObj.drawString("S", this.x+25+5+(25/2-mc.fontRendererObj.getStringWidth("S") + 4), this.y+38, chroma.getValue() ? RainbowUtil.getRainbow(4f, 0.8f, 0.85f) : mc.gameSettings.keyBindBack.pressed ? RenderUtils.getColor(colorp) : RenderUtils.getColor(color), tshadow.getValue()); mc.fontRendererObj.drawString("S", this.x+25+5+(25/2-mc.fontRendererObj.getStringWidth("S") + 4), this.y+38, chroma.getValue() ? RainbowUtil.getRainbow(4f, 0.8f, 0.85f) : sKey ? getColor(colorp) : getColor(color), tshadow.getValue());
mc.fontRendererObj.drawString("A", this.x+3+(25/2-mc.fontRendererObj.getStringWidth("A") + 4), this.y+38, chroma.getValue() ? RainbowUtil.getRainbow(4f, 0.8f, 0.85f) : mc.gameSettings.keyBindLeft.pressed ? RenderUtils.getColor(colorp) : RenderUtils.getColor(color), tshadow.getValue()); mc.fontRendererObj.drawString("A", this.x+3+(25/2-mc.fontRendererObj.getStringWidth("A") + 4), this.y+38, chroma.getValue() ? RainbowUtil.getRainbow(4f, 0.8f, 0.85f) : aKey ? getColor(colorp) : getColor(color), tshadow.getValue());
mc.fontRendererObj.drawString("D", this.x+-3+25+25+10+(25/2-mc.fontRendererObj.getStringWidth("D") + 4), this.y+38, chroma.getValue() ? RainbowUtil.getRainbow(4f, 0.8f, 0.85f) : mc.gameSettings.keyBindRight.pressed ? RenderUtils.getColor(colorp) : RenderUtils.getColor(color), tshadow.getValue()); mc.fontRendererObj.drawString("D", this.x+-3+25+25+10+(25/2-mc.fontRendererObj.getStringWidth("D") + 4), this.y+38, chroma.getValue() ? RainbowUtil.getRainbow(4f, 0.8f, 0.85f) : dKey ? getColor(colorp) : getColor(color), tshadow.getValue());
if(jump.getValue()) if(jump.getValue())
mc.fontRendererObj.drawString("\u00A7m-------", this.x+85+(25/2-mc.fontRendererObj.getStringWidth("u00A7m-------") + 4), this.y+92-3, (chroma.getValue() ? RainbowUtil.getRainbow(4f, 0.8f, 0.85f) : mc.gameSettings.keyBindJump.pressed ? RenderUtils.getColor(colorp) : RenderUtils.getColor(color)), tshadow.getValue()); mc.fontRendererObj.drawString("\u00A7m------", this.x+85+(25/2-mc.fontRendererObj.getStringWidth("u00A7m------") + 4), this.y+92-3, (chroma.getValue() ? RainbowUtil.getRainbow(4f, 0.8f, 0.85f) : jumpKey ? getColor(colorp) : getColor(color)), tshadow.getValue());
if(sneak.getValue()) if(sneak.getValue())
mc.fontRendererObj.drawString("Sneak", this.x+38+3+(25/2-mc.fontRendererObj.getStringWidth("Sneak") + 4), jump.getValue() ? this.y+92+15+1-3 : this.y+92-4, (chroma.getValue() ? RainbowUtil.getRainbow(4f, 0.8f, 0.85f) : mc.gameSettings.keyBindSneak.pressed ? RenderUtils.getColor(colorp) : RenderUtils.getColor(color)), tshadow.getValue()); mc.fontRendererObj.drawString("Sneak", this.x+38+3+(25/2-mc.fontRendererObj.getStringWidth("Sneak") + 4), jump.getValue() ? this.y+92+15+1-3 : this.y+92-4, (chroma.getValue() ? RainbowUtil.getRainbow(4f, 0.8f, 0.85f) : mc.gameSettings.keyBindSneak.pressed ? getColor(colorp) : getColor(color)), tshadow.getValue());
mc.fontRendererObj.drawString("LMB", this.x+3+40/2-mc.fontRendererObj.getStringWidth("LMB")/2, (this.y+60+25/2)-mc.fontRendererObj.FONT_HEIGHT/2-3, chroma.getValue() ? RainbowUtil.getRainbow(4f, 0.8f, 0.85f) : Mouse.isButtonDown(0) ? RenderUtils.getColor(colorp) : RenderUtils.getColor(color), tshadow.getValue()); mc.fontRendererObj.drawString("LMB", this.x+3+40/2-mc.fontRendererObj.getStringWidth("LMB")/2, (this.y+60+25/2)-mc.fontRendererObj.FONT_HEIGHT/2-3, chroma.getValue() ? RainbowUtil.getRainbow(4f, 0.8f, 0.85f) : Mouse.isButtonDown(0) ? getColor(colorp) : getColor(color), tshadow.getValue());
mc.fontRendererObj.drawString("RMB", this.x+40+3+40/2-mc.fontRendererObj.getStringWidth("RMB")/2, (this.y+60+25/2)-mc.fontRendererObj.FONT_HEIGHT/2-3, chroma.getValue() ? RainbowUtil.getRainbow(4f, 0.8f, 0.85f) : Mouse.isButtonDown(1) ? RenderUtils.getColor(colorp) : RenderUtils.getColor(color), tshadow.getValue()); mc.fontRendererObj.drawString("RMB", this.x+40+3+40/2-mc.fontRendererObj.getStringWidth("RMB")/2, (this.y+60+25/2)-mc.fontRendererObj.FONT_HEIGHT/2-3, chroma.getValue() ? RainbowUtil.getRainbow(4f, 0.8f, 0.85f) : Mouse.isButtonDown(1) ? getColor(colorp) : getColor(color), tshadow.getValue());
GlStateManager.popMatrix(); GlStateManager.popMatrix();
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
GlStateManager.translate(this.x + 1, this.y + 1, 0); GlStateManager.translate(this.x + 1, this.y + 1, 0);
@ -139,4 +154,27 @@ public class KeyStrokes extends RenderModule{
GlStateManager.popMatrix(); GlStateManager.popMatrix();
} }
public static int getColor(ModeSetting asdf) {
switch (asdf.getValue()) {
case "Red":
return new Color(255, 0, 0, 140).getRGB();
case "Yellow":
return new Color(255, 255, 0, 140).getRGB();
case "Green":
return new Color(0, 255, 0, 140).getRGB();
case "Blue":
return new Color(0, 0, 255, 140).getRGB();
case "Orange":
return new Color(255, 165, 0, 140).getRGB();
case "Pink":
return new Color(255, 102, 255, 140).getRGB();
case "Black":
return new Color(0, 0, 0, 140).getRGB();
case "White":
return new Color(255, 255, 255, 140).getRGB();
}
return -1;
}
} }

View File

@ -1,6 +1,7 @@
package dev.resent.util.render; package dev.resent.util.render;
import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.*; import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.GL_ONE_MINUS_SRC_ALPHA;
import static net.lax1dude.eaglercraft.v1_8.opengl.RealOpenGLEnums.GL_SRC_ALPHA;
import dev.resent.module.setting.ModeSetting; import dev.resent.module.setting.ModeSetting;
import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
@ -11,28 +12,6 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
public class RenderUtils { public class RenderUtils {
public static int getColor(ModeSetting asdf) {
switch (asdf.getValue()) {
case "Red":
return new Color(255, 0, 0, 140).getRGB();
case "Yellow":
return new Color(255, 255, 0, 140).getRGB();
case "Green":
return new Color(0, 255, 0, 140).getRGB();
case "Blue":
return new Color(0, 0, 255, 140).getRGB();
case "Orange":
return new Color(255, 165, 0, 140).getRGB();
case "Pink":
return new Color(255, 102, 255, 140).getRGB();
case "Black":
return new Color(0, 0, 0, 140).getRGB();
case "White":
return new Color(255, 255, 255, 140).getRGB();
}
return -1;
}
public static void drawChromaString(String string, int x, int y, boolean shadow) { public static void drawChromaString(String string, int x, int y, boolean shadow) {
Minecraft mc = Minecraft.getMinecraft(); Minecraft mc = Minecraft.getMinecraft();
@ -47,6 +26,91 @@ public class RenderUtils {
} }
} }
public static void drawRoundedRect(final float paramInt1, final float paramInt2, final float paramInt3, final float paramInt4, final float radius, final int color) {
final float f1 = (color >> 24 & 0xFF) / 255.0f;
final float f2 = (color >> 16 & 0xFF) / 255.0f;
final float f3 = (color >> 8 & 0xFF) / 255.0f;
final float f4 = (color & 0xFF) / 255.0f;
GlStateManager.color(f2, f3, f4, f1);
drawRoundedRect(paramInt1, paramInt2, paramInt3, paramInt4, radius);
}
public static void drawRoundedRect(final float paramFloat1, final float paramFloat2, final float paramFloat3, final float paramFloat4, final float paramFloat5) {
final int i = 18;
final float f1 = 90.0f / i;
Tessellator tessellator = Tessellator.getInstance();
WorldRenderer worldrenderer = tessellator.getWorldRenderer();
GlStateManager.disableTexture2D();
GlStateManager.enableBlend();
GlStateManager.disableCull();
GlStateManager.enableColorMaterial();
GlStateManager.blendFunc(770, 771);
GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
GlStateManager.shadeModel(7425);
worldrenderer.begin(5, DefaultVertexFormats.POSITION_TEX);
worldrenderer.pos(paramFloat1 + paramFloat5, paramFloat2, 0).endVertex();
worldrenderer.pos(paramFloat1 + paramFloat5, paramFloat4, 0).endVertex();
worldrenderer.pos(paramFloat3 - paramFloat5, paramFloat2, 0).endVertex();
worldrenderer.pos(paramFloat3 - paramFloat5, paramFloat4, 0).endVertex();
tessellator.draw();
worldrenderer.begin(5, DefaultVertexFormats.POSITION_TEX);
worldrenderer.pos(paramFloat1, paramFloat2 + paramFloat5, 0).endVertex();
worldrenderer.pos(paramFloat1 + paramFloat5, paramFloat2 + paramFloat5, 0).endVertex();
worldrenderer.pos(paramFloat1, paramFloat4 - paramFloat5, 0).endVertex();
worldrenderer.pos(paramFloat1 + paramFloat5, paramFloat4 - paramFloat5, 0).endVertex();
tessellator.draw();
worldrenderer.begin(5, DefaultVertexFormats.POSITION_TEX);
worldrenderer.pos(paramFloat3, paramFloat2 + paramFloat5, 0).endVertex();
worldrenderer.pos(paramFloat3 - paramFloat5, paramFloat2 + paramFloat5, 0).endVertex();
worldrenderer.pos(paramFloat3, paramFloat4 - paramFloat5, 0).endVertex();
worldrenderer.pos(paramFloat3 - paramFloat5, paramFloat4 - paramFloat5, 0).endVertex();
tessellator.draw();
worldrenderer.begin(6, DefaultVertexFormats.POSITION_TEX);
float f2 = paramFloat3 - paramFloat5;
float f3 = paramFloat2 + paramFloat5;
worldrenderer.pos(f2, f3, 0).endVertex();
for (int j = 0; j <= i; ++j) {
final float f4 = j * f1;
worldrenderer.pos((float)(f2 + paramFloat5 * Math.cos(Math.toRadians(f4))), (float)(f3 - paramFloat5 * Math.sin(Math.toRadians(f4))), 0).endVertex();
}
tessellator.draw();
worldrenderer.begin(6, DefaultVertexFormats.POSITION_TEX);
f2 = paramFloat1 + paramFloat5;
f3 = paramFloat2 + paramFloat5;
worldrenderer.pos(f2, f3, 0).endVertex();
for (int j = 0; j <= i; ++j) {
final float f4 = j * f1;
worldrenderer.pos((float)(f2 - paramFloat5 * Math.cos(Math.toRadians(f4))), (float)(f3 - paramFloat5 * Math.sin(Math.toRadians(f4))), 0).endVertex();
}
tessellator.draw();
worldrenderer.begin(6, DefaultVertexFormats.POSITION_TEX);
f2 = paramFloat1 + paramFloat5;
f3 = paramFloat4 - paramFloat5;
worldrenderer.pos(f2, f3, 0).endVertex();
for (int j = 0; j <= i; ++j) {
final float f4 = j * f1;
worldrenderer.pos((float)(f2 - paramFloat5 * Math.cos(Math.toRadians(f4))), (float)(f3 + paramFloat5 * Math.sin(Math.toRadians(f4))), 0).endVertex();
}
tessellator.draw();
worldrenderer.begin(6, DefaultVertexFormats.POSITION_TEX);
f2 = paramFloat3 - paramFloat5;
f3 = paramFloat4 - paramFloat5;
worldrenderer.pos(f2, f3, 0).endVertex();
for (int j = 0; j <= i; ++j) {
final float f4 = j * f1;
worldrenderer.pos((float)(f2 + paramFloat5 * Math.cos(Math.toRadians(f4))), (float)(f3 + paramFloat5 * Math.sin(Math.toRadians(f4))), 0).endVertex();
}
tessellator.draw();
GlStateManager.shadeModel(7424);
GlStateManager.enableCull();
GlStateManager.disableBlend();
GlStateManager.disableColorMaterial();
GlStateManager.enableTexture2D();
}
public static void drawRect(int left, int top, int right, int bottom, int color) { public static void drawRect(int left, int top, int right, int bottom, int color) {
if (left < right) { if (left < right) {
int i = left; int i = left;

View File

@ -13,13 +13,9 @@ import com.google.common.base.Predicate;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import dev.resent.Resent;
import dev.resent.animation.SimpleAnimation; import dev.resent.animation.SimpleAnimation;
import dev.resent.module.base.Mod;
import dev.resent.module.base.ModManager; import dev.resent.module.base.ModManager;
import dev.resent.module.base.RenderModule;
import dev.resent.module.impl.misc.Crosshair; import dev.resent.module.impl.misc.Crosshair;
import dev.resent.ui.HUDConfigScreen;
import dev.resent.util.misc.W; import dev.resent.util.misc.W;
import dev.resent.util.render.Color; import dev.resent.util.render.Color;
import dev.resent.util.render.RenderUtils; import dev.resent.util.render.RenderUtils;

View File

@ -91,58 +91,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import net.minecraft.world.WorldSettings; import net.minecraft.world.WorldSettings;
import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.crash.CrashReportCategory;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.boss.BossStatus;
import net.minecraft.entity.item.EntityItemFrame;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EntitySelectors;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.EnumWorldBlockLayer;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MouseFilter;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.ReportedException;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.Vec3;
import net.minecraft.world.WorldSettings;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.crash.CrashReportCategory;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.boss.BossStatus;
import net.minecraft.entity.item.EntityItemFrame;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EntitySelectors;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.EnumWorldBlockLayer;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MouseFilter;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.ReportedException;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.Vec3;
import net.minecraft.world.WorldSettings;
import net.minecraft.world.biome.BiomeGenBase;
/**+ /**+
* This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code. * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
@ -938,10 +886,8 @@ public class EntityRenderer implements IResourceManagerReloadListener {
GlStateManager.enableOverlayFramebufferBlending(); GlStateManager.enableOverlayFramebufferBlending();
this.mc.ingameGUI.renderGameOverlay(parFloat1); this.mc.ingameGUI.renderGameOverlay(parFloat1);
for (Mod m : Resent.INSTANCE.modManager.modules) { for (Mod m : Resent.INSTANCE.modManager.modules) {
if (m.isEnabled() && (m instanceof RenderModule)) { if (m.isEnabled() && m instanceof RenderModule && !(mc.currentScreen instanceof HUDConfigScreen)) {
if (!(mc.currentScreen instanceof HUDConfigScreen)) { ((RenderModule) m).draw();
((RenderModule) m).draw();
}
} }
} }
GlStateManager.disableOverlayFramebufferBlending(); GlStateManager.disableOverlayFramebufferBlending();