fix
This commit is contained in:
parent
19d27a5fb4
commit
176edda94d
54312
javascript/classes.js
54312
javascript/classes.js
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
@ -52,19 +52,15 @@ public class ClickGuiRewrite extends GuiScreen {
|
||||||
public int scrollOffset = 0;
|
public int scrollOffset = 0;
|
||||||
public String part = "Home";
|
public String part = "Home";
|
||||||
|
|
||||||
public Animation bgDimAnim;
|
|
||||||
public Animation searchCursorAnim;
|
public Animation searchCursorAnim;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void drawScreen(int mouseX, int mouseY, float var3) {
|
public void drawScreen(int mouseX, int mouseY, float var3) {
|
||||||
//GlStateManager.scale(1f,1f,0f);
|
|
||||||
|
|
||||||
int offset = 0;
|
int offset = 0;
|
||||||
// background dim
|
// background dim
|
||||||
drawRect(0, 0, /*used big number bc width and height not working for some reason */ 999999, 999999, new Color(0, 0, 0, (int) bgDimAnim.getValue()).getRGB());
|
drawRect(0, 0, 999999, 999999, new Color(0, 0, 0, 150).getRGB());
|
||||||
|
|
||||||
GlUtils.startScale(x+width/2, y+height/2, 1);
|
GlUtils.startScale(x+width/2, y+height/2, 1);
|
||||||
|
|
||||||
GlStateManager.translate(0, (height + y) - introAnimation.getValue(), 0);
|
GlStateManager.translate(0, (height + y) - introAnimation.getValue(), 0);
|
||||||
/* !-------------- NECESSARY ELEMENTS -----------------! */
|
/* !-------------- NECESSARY ELEMENTS -----------------! */
|
||||||
|
|
||||||
|
@ -126,11 +122,11 @@ public class ClickGuiRewrite extends GuiScreen {
|
||||||
|
|
||||||
if (isSearchFocused) {
|
if (isSearchFocused) {
|
||||||
drawRect(x+width-271+fr.getStringWidth(searchString), y+38, x+width-270+fr.getStringWidth(searchString), y+50,
|
drawRect(x+width-271+fr.getStringWidth(searchString), y+38, x+width-270+fr.getStringWidth(searchString), y+50,
|
||||||
new Color(secondaryFontColor.getRed(), secondaryFontColor.getGreen(), secondaryFontColor.getBlue(), (int) searchCursorAnim.getValue()).getRGB());
|
new Color(187, 134, 252, (int) searchCursorAnim.getValue()).getRGB());
|
||||||
}
|
|
||||||
|
|
||||||
if (searchCursorAnim.isDone()) {
|
if (searchCursorAnim.isDone()) {
|
||||||
searchCursorAnim.changeDirection();
|
searchCursorAnim.changeDirection();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
GlStateManager.popMatrix();
|
GlStateManager.popMatrix();
|
||||||
|
@ -195,7 +191,6 @@ public class ClickGuiRewrite extends GuiScreen {
|
||||||
}
|
}
|
||||||
|
|
||||||
introAnimation.setDirection(Direction.BACKWARDS);
|
introAnimation.setDirection(Direction.BACKWARDS);
|
||||||
bgDimAnim.setDirection(Direction.BACKWARDS);
|
|
||||||
if (introAnimation.isDone(Direction.BACKWARDS)) {
|
if (introAnimation.isDone(Direction.BACKWARDS)) {
|
||||||
mc.displayGuiScreen(null);
|
mc.displayGuiScreen(null);
|
||||||
}
|
}
|
||||||
|
@ -219,14 +214,10 @@ public class ClickGuiRewrite extends GuiScreen {
|
||||||
mc.displayGuiScreen(new HUDConfigScreen(this));
|
mc.displayGuiScreen(new HUDConfigScreen(this));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isMouseInside(mouseX, mouseY, x+width-300, y+25, x+width-50, y+65)) {
|
if (isMouseInside(mouseX, mouseY, x+width-300, y+25, x+width-50, y+65))
|
||||||
isSearchFocused = true;
|
isSearchFocused = true; else isSearchFocused = false;
|
||||||
} else {
|
|
||||||
isSearchFocused = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
int offset = 0;
|
int offset = 0;
|
||||||
|
|
||||||
for (Mod m : Resent.INSTANCE.modManager.modules) {
|
for (Mod m : Resent.INSTANCE.modManager.modules) {
|
||||||
if (!m.isAdmin() && m.getName().toLowerCase().startsWith(searchString.toLowerCase()) && selectedMod == null) {
|
if (!m.isAdmin() && m.getName().toLowerCase().startsWith(searchString.toLowerCase()) && selectedMod == null) {
|
||||||
if (y+125+offset+scrollOffset > y+95 && y+175+offset+scrollOffset < y+height && part == "Home") {
|
if (y+125+offset+scrollOffset > y+95 && y+175+offset+scrollOffset < y+height && part == "Home") {
|
||||||
|
@ -271,8 +262,8 @@ public class ClickGuiRewrite extends GuiScreen {
|
||||||
y = sr.getScaledHeight() / 10;
|
y = sr.getScaledHeight() / 10;
|
||||||
width = sr.getScaledWidth() / 1.25F;
|
width = sr.getScaledWidth() / 1.25F;
|
||||||
height = sr.getScaledHeight() / 1.25F;
|
height = sr.getScaledHeight() / 1.25F;
|
||||||
|
//introAnimation = Theme.getAnimation(500, 255, 3, 3.8F, 1.35F, false);
|
||||||
introAnimation = new EaseInOutQuad(500, height + y);
|
introAnimation = new EaseInOutQuad(500, height + y);
|
||||||
bgDimAnim = new EaseInOutQuad(500, 150);
|
|
||||||
searchCursorAnim = new EaseInOutQuad(300, 255);
|
searchCursorAnim = new EaseInOutQuad(300, 255);
|
||||||
fr = mc.fontRendererObj;
|
fr = mc.fontRendererObj;
|
||||||
partAnimation = new SimpleAnimation(0.0F);
|
partAnimation = new SimpleAnimation(0.0F);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user