3rdparty/resent-1.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Begin work on new booleansetting gui

Browse Source
This commit is contained in:
ThisIsALegitUsername 2023-02-09 15:44:42 +00:00
parent 696a43898c
commit 15fc0aef7e
6 changed files with 18519 additions and 18513 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktopRuntime/resources/assets/eagler/gui/check.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
javascript/assets.epk
View File

Binary file not shown.

36998
javascript/classes.js
View File

File diff suppressed because it is too large Load Diff

2
javascript/classes.js.map
View File

File diff suppressed because one or more lines are too long

28
src/main/java/dev/resent/ui/ClickGUI.java
View File

@ -77,7 +77,6 @@ public class ClickGUI extends GuiScreen {
if (modWatching != null) { if (modWatching != null) {
int var = 0; int var = 0;
fr.drawString("<", x - fr.FONT_HEIGHT + 4, height + 29 + fr.FONT_HEIGHT + 2, -1);
for (int asdf = 0; asdf < this.modWatching.settings.size(); asdf++) { for (int asdf = 0; asdf < this.modWatching.settings.size(); asdf++) {
BooleanSetting b; BooleanSetting b;
ModeSetting m; ModeSetting m;
@ -161,12 +160,12 @@ public class ClickGUI extends GuiScreen {
if (m.hasSetting) { if (m.hasSetting) {
//fr.drawString("o", this.x+99+xo, height - 2 - fh * -(off) + 51 + 1 - offset, isMouseInside(mouseX, mouseY, this.x + 90 + xo - 1 + 10, height - 2 - fh * -(off) + 51 + 1 - offset, this.x + 90 + xo - 1 + 10 + fr.getStringWidth("o"), height - 2 - fh * -(off) + 51 + 1 - offset + fr.FONT_HEIGHT) ? new Color(105, 105, 105, 65).getRGB() : -1); //fr.drawString("o", this.x+99+xo, height - 2 - fh * -(off) + 51 + 1 - offset, isMouseInside(mouseX, mouseY, this.x + 90 + xo - 1 + 10, height - 2 - fh * -(off) + 51 + 1 - offset, this.x + 90 + xo - 1 + 10 + fr.getStringWidth("o"), height - 2 - fh * -(off) + 51 + 1 - offset + fr.FONT_HEIGHT) ? new Color(105, 105, 105, 65).getRGB() : -1);
GlStateManager.enableBlend(); GlStateManager.enableBlend();
GlStateManager.color(1.0f, 1.0f, 1.0f, 255f);
if(isMouseInside(mouseX, mouseY, this.x + 90 + xo - 1 + 10, height - 2 - fh * -(off) + 51 + 1 - offset, this.x + 90 + xo - 1 + 10 + fr.getStringWidth("o"), height - 2 - fh * -(off) + 51 + 1 - offset + 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 + 10 + fr.getStringWidth("o"), height - 2 - fh * -(off) + 51 + 1 - offset + fr.FONT_HEIGHT))
GlStateManager.color(1,1,1,0.5f); GlStateManager.color(1,1,1,0.5f);
this.mc.getTextureManager().bindTexture(new ResourceLocation("eagler:gui/gear.png")); this.mc.getTextureManager().bindTexture(new ResourceLocation("eagler:gui/gear.png"));
Gui.drawModalRectWithCustomSizedTexture(this.x+99+xo, height - 2 - fh * -(off) + 51 + 1 - offset, 0, 0, 8, 8, 8, 8); Gui.drawModalRectWithCustomSizedTexture(this.x+99+xo, height - 2 - fh * -(off) + 51 + 1 - offset, 0, 0, 8, 8, 8, 8);
GlStateManager.disableBlend(); GlStateManager.disableBlend();
GlStateManager.color(1, 1, 1, 255);
} }
fr.drawStringWithShadow(m.name, this.x + 15 + 7 + xo, height - fh * -(off) + 50 - offset, -1); fr.drawStringWithShadow(m.name, this.x + 15 + 7 + xo, height - fh * -(off) + 50 - offset, -1);
@ -177,26 +176,31 @@ public class ClickGUI extends GuiScreen {
fr.drawStringWithShadow("Resent - " + modWatching.name, GuiScreen.width / 2 - (fr.getStringWidth("Resent - " + modWatching.name) / 2), height + 29 - fr.FONT_HEIGHT - 2, -1); fr.drawStringWithShadow("Resent - " + modWatching.name, GuiScreen.width / 2 - (fr.getStringWidth("Resent - " + modWatching.name) / 2), height + 29 - fr.FONT_HEIGHT - 2, -1);
for (int amogus = 0; amogus < this.modWatching.settings.size(); amogus++) { for (int amogus = 0; amogus < this.modWatching.settings.size(); amogus++) {
ModeSetting mo;
BooleanSetting b; BooleanSetting b;
ModeSetting mo = null;
Setting s = this.modWatching.settings.get(amogus); Setting s = this.modWatching.settings.get(amogus);
if (s instanceof BooleanSetting) { if (s instanceof BooleanSetting) {
b = (BooleanSetting) s; b = (BooleanSetting) s;
RenderUtils.drawRectOutline(this.x + 6 + 6, height - fr.FONT_HEIGHT + 50 + var, this.x + 15 + 6, height - fr.FONT_HEIGHT + 50 + fr.FONT_HEIGHT + var, b.getValue() ? Color.GREEN.getRGB() : Color.RED.getRGB());
drawRect( drawRect(
this.x + 13, this.x + 11,
height - fr.FONT_HEIGHT + 50 + var + 1, height - fr.FONT_HEIGHT + 50 + var,
this.x + 20, this.x + 19,
height - fr.FONT_HEIGHT + 50 + fr.FONT_HEIGHT + var-1, height - fr.FONT_HEIGHT + 50 + fr.FONT_HEIGHT + var-1,
isMouseInside(mouseX, mouseY, this.x + 6 + 1 + 6, height - fr.FONT_HEIGHT + 50 + var + 1, this.x + 15 - 1 + 6, height - fr.FONT_HEIGHT + 50 + fr.FONT_HEIGHT + var - 1) ? new Color(211, 211, 211, 65).getRGB() : new Color(105, 105, 105, 65).getRGB() isMouseInside(
); mouseX, mouseY,
this.x + 11,
height - fr.FONT_HEIGHT + 50 + var,
this.x + 19,
height - fr.FONT_HEIGHT + 50 + fr.FONT_HEIGHT + var-1) ? new Color(0, 0, 200).getRGB() : new Color(0, 0, 230).getRGB());
if(b.getValue()){
mc.getTextureManager().bindTexture(new ResourceLocation("eagler:gui/check.png"));
Gui.drawModalRectWithCustomSizedTexture(this.x+11, height-fr.FONT_HEIGHT+50+var, 0, 0, 8, 8, 8, 8);
}
} }
if (s instanceof ModeSetting) { if (s instanceof ModeSetting) {
mo = (ModeSetting) s; mo = (ModeSetting) s;
}
if (s instanceof ModeSetting) {
fr.drawStringWithShadow(s.name + ": " + mo.getValue(), this.x + 18 + 6, height - fr.FONT_HEIGHT + 50 + var, -1); fr.drawStringWithShadow(s.name + ": " + mo.getValue(), this.x + 18 + 6, height - fr.FONT_HEIGHT + 50 + var, -1);
} else { } else {
fr.drawStringWithShadow(s.name, this.x + 18 + 6, height - fr.FONT_HEIGHT + 50 + var, -1); fr.drawStringWithShadow(s.name, this.x + 18 + 6, height - fr.FONT_HEIGHT + 50 + var, -1);

2
src/main/java/net/minecraft/client/gui/Gui.java
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(int 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, int width, int 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();