Fix clickgui bug, add even more animations
This commit is contained in:
parent
643bd36ec1
commit
a1dc9ee110
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
@ -51,7 +51,7 @@ public class ClickGUI extends GuiScreen {
|
||||||
for (Mod m : Resent.INSTANCE.modManager.modules) {
|
for (Mod m : Resent.INSTANCE.modManager.modules) {
|
||||||
int fh = fr.FONT_HEIGHT;
|
int fh = fr.FONT_HEIGHT;
|
||||||
|
|
||||||
if (isMouseInside(mouseX, mouseY, this.x + 90 + xo - 1 + 10, height - 2 - fh * -(off) + 51 - 1 - offset, this.x + 90 + xo - 1 + 21, height + 30 - fh * (-off) + 30 - 1 + 2 - 1 - offset) && m.hasSetting) {
|
if (isMouseInside(mouseX, mouseY, this.x + 90 + xo - 1 + 10, height - 2 - fh * -(off) + 51 - 1 - offset, this.x + 90 + xo - 1 + 21, height + 30 - fh * (-off) + 30 - 1 + 2 - 1 - offset) && m.hasSetting && modWatching == null) {
|
||||||
// Open settings
|
// Open settings
|
||||||
this.modWatching = m;
|
this.modWatching = m;
|
||||||
} else if (isMouseInside(mouseX, mouseY, x - fr.FONT_HEIGHT + 2, height + 27 + fr.FONT_HEIGHT + 2, x - fr.FONT_HEIGHT + 6 + fr.getStringWidth("<"), height + 33 + fr.FONT_HEIGHT + 2 + fr.getStringWidth("<")) && mouseButton == 0) {
|
} else if (isMouseInside(mouseX, mouseY, x - fr.FONT_HEIGHT + 2, height + 27 + fr.FONT_HEIGHT + 2, x - fr.FONT_HEIGHT + 6 + fr.getStringWidth("<"), height + 33 + fr.FONT_HEIGHT + 2 + fr.getStringWidth("<")) && mouseButton == 0) {
|
||||||
|
@ -256,7 +256,7 @@ public class ClickGUI extends GuiScreen {
|
||||||
@Override
|
@Override
|
||||||
public void initGui() {
|
public void initGui() {
|
||||||
mc.gameSettings.loadOptions();
|
mc.gameSettings.loadOptions();
|
||||||
introAnimation = Theme.getAnimation(Theme.getAnimationId(), 750, 1, 2, 3.8f, 1.25f, false);
|
introAnimation = Theme.getAnimation(Theme.getAnimationId(), 750, 1, 2, 3.8f, 1.35f, false);
|
||||||
//introAnimation = new ElasticAnimation(750, 1, 3.8f, 1.35f, false);
|
//introAnimation = new ElasticAnimation(750, 1, 3.8f, 1.35f, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user