make it look decent on chromebook screen

also formatted math to use less spaces
This commit is contained in:
ThisIsALegitUsername 2023-04-06 09:47:11 -06:00
parent e3bf5cb9f2
commit a9a8c48e37
2 changed files with 41 additions and 41 deletions

View File

@ -114,9 +114,9 @@ public class ClickGuiRewrite extends GuiScreen {
//Draw module button //Draw module button
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 + 115 + offset + scrollOffset > y + 95 && y + 185 + offset + scrollOffset < y + height && part == "Home") { if (y+125+offset+scrollOffset > y+95 && y+175+offset+scrollOffset < y+height && part == "Home") {
//Body //Body
RenderUtils.drawRoundedRect(x + 80, y + 115 + offset + scrollOffset, x + width - 20, y + 185 + offset + scrollOffset, 16, secondaryColor); RenderUtils.drawRoundedRect(x+80, y+125+offset+scrollOffset, x+width-20, y+175+offset+scrollOffset, 16, secondaryColor);
//Gear //Gear
if (m.doesHaveSetting()) { if (m.doesHaveSetting()) {
@ -127,7 +127,7 @@ public class ClickGuiRewrite extends GuiScreen {
//RenderUtils.drawRoundedRect(x+width-60, y+140+offset, x+width-40, y+160+offset, 4, -1); //RenderUtils.drawRoundedRect(x+width-60, y+140+offset, x+width-40, y+160+offset, 4, -1);
//Toggle //Toggle
RenderUtils.drawRoundedRect(x + 90, y + 125 + offset + scrollOffset, x + 140, y + 175 + offset + scrollOffset, 8, m.isEnabled() ? onSurfaceColor : new Color(66, 66, 66).getRGB()); RenderUtils.drawRoundedRect(x+100, y+135+offset+scrollOffset, x+130, y+165+offset+scrollOffset, 8, m.isEnabled() ? onSurfaceColor : new Color(66, 66, 66).getRGB());
GlUtils.startScale(x+90, y+140+offset+scrollOffset, 2); GlUtils.startScale(x+90, y+140+offset+scrollOffset, 2);
int i = fr.drawString(m.getName(), x+120, y+140+offset+scrollOffset, -1, false); int i = fr.drawString(m.getName(), x+120, y+140+offset+scrollOffset, -1, false);
@ -137,11 +137,11 @@ public class ClickGuiRewrite extends GuiScreen {
GlStateManager.popMatrix(); GlStateManager.popMatrix();
// if (isMouseInside(mouseX, mouseY, x+i+80, y+115+offset+scrollOffset, x+width-20, y+185+offset+scrollOffset)) { // if (isMouseInside(mouseX, mouseY, x+i+80, y+115+offset+scrollOffset, x+width-20, y+185+offset+scrollOffset)) {
// fr.drawString(m.getDescription(), mouseX + 8, mouseY, onSurfaceColor, false); // fr.drawString(m.getDescription(), mousex+8, mouseY, onSurfaceColor, false);
// } // }
} }
offset += 80; offset+= 60;
} }
} }
@ -194,7 +194,7 @@ public class ClickGuiRewrite extends GuiScreen {
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 + 115 + offset + scrollOffset > y + 95 && y + 185 + offset + scrollOffset < y + height && part == "Home") { if (y+125+offset+scrollOffset > y+95 && y+175+offset+scrollOffset < y+height && part == "Home") {
if (isMouseInside(mouseX, mouseY, x+width-60, y+140+offset+scrollOffset, x+width-40, y+160+offset+scrollOffset) && mouseButton == 0 && m.doesHaveSetting()) { if (isMouseInside(mouseX, mouseY, x+width-60, y+140+offset+scrollOffset, x+width-40, y+160+offset+scrollOffset) && mouseButton == 0 && m.doesHaveSetting()) {
selectedMod = m; selectedMod = m;
@ -209,7 +209,7 @@ public class ClickGuiRewrite extends GuiScreen {
} }
} }
if(isMouseInside(mouseX, mouseY, x + 80, y + 115 + offset + scrollOffset, x + width - 20, y + 185 + offset + scrollOffset)) { if(isMouseInside(mouseX, mouseY, x+80, y+125+offset+scrollOffset, x+width-20, y+175+offset+scrollOffset)) {
if(mouseButton == 1 && m.doesHaveSetting()) { if(mouseButton == 1 && m.doesHaveSetting()) {
selectedMod = m; selectedMod = m;
@ -230,7 +230,7 @@ public class ClickGuiRewrite extends GuiScreen {
} }
} }
offset += 80; offset+= 60;
} }
} }
@ -307,6 +307,6 @@ public class ClickGuiRewrite extends GuiScreen {
} }
public int getMaxScroll() { public int getMaxScroll() {
return Resent.INSTANCE.modManager.modules.size() * -70; return Resent.INSTANCE.modManager.modules.size() * -53;
} }
} }

View File

@ -207,7 +207,7 @@ public class Gui {
* Draws a textured rectangle at z = 0. Args: x, y, u, v, width, * Draws a textured rectangle at z = 0. Args: x, y, u, v, width,
* height, textureWidth, textureHeight * height, textureWidth, textureHeight
*/ */
public static void drawModalRectWithCustomSizedTexture(double x, int y, float u, float v, int width, int height, float textureWidth, float textureHeight) { public static void drawModalRectWithCustomSizedTexture(double x, int y, float u, float v, float width, float height, float textureWidth, float textureHeight) {
float f = 1.0F / textureWidth; float f = 1.0F / textureWidth;
float f1 = 1.0F / textureHeight; float f1 = 1.0F / textureHeight;
Tessellator tessellator = Tessellator.getInstance(); Tessellator tessellator = Tessellator.getInstance();