diff --git a/client/src/main/java/client/Client.java b/client/src/main/java/client/Client.java index b0ade46a..f6200e01 100755 --- a/client/src/main/java/client/Client.java +++ b/client/src/main/java/client/Client.java @@ -611,11 +611,11 @@ public class Client implements IThreadListener { private int savedY = 0x80000000; @Variable(name = "gui_scale", category = CVarCategory.GUI, min = 1, max = 5, display = "Skalierung", unit = "x", callback = RedrawFunction.class) - private int scaleVar = 2; + private int scaleVar = 1; @Variable(name = "gui_scale_items", category = CVarCategory.GUI, display = "Gegenstände vergrößern", callback = ItemRedrawFunction.class) - public boolean scaleItems = false; + public boolean scaleItems = true; @Variable(name = "gui_scale_hotbar", category = CVarCategory.GUI, display = "Leiste vergrößern") - public boolean scaleHotbar = false; + public boolean scaleHotbar = true; @Variable(name = "hud_margin", category = CVarCategory.GUI, min = 0, max = 120, unit = "px", display = "Seitenabstand der HUD") private int hudMargin = 4; @Variable(name = "phy_sensitivity", category = CVarCategory.INPUT, min = 0.01f, max = 10.0f, display = "Mausempfindlichkeit", precision = 2, unit = "%") diff --git a/client/src/main/java/client/gui/Style.java b/client/src/main/java/client/gui/Style.java index 367ae626..d85c27a4 100644 --- a/client/src/main/java/client/gui/Style.java +++ b/client/src/main/java/client/gui/Style.java @@ -40,9 +40,9 @@ public enum Style implements Identifyable, Displayable { static { DEFAULT - .border(0xa0a0a0, 0x202020) - .base(0x606060, 0x404040, 0xffffff, 0xefefef) - .field(0x000000, 0x101010, 0xffffff); + .border(0xb0b0b0, 0x202020) + .base(0x808080, 0x000000, 0xffffff, 0xffffff) + .field(0x404040, 0x808080, 0xffffff); SHINY .border(0xffffff, 0x3f3f3f) @@ -50,17 +50,17 @@ public enum Style implements Identifyable, Displayable { .field(0x000000, 0x202020, 0xdfdfdf); GRAY - .border(0x000000, 0x202020) - .base(0x808080, 0x000000, 0xffffff, 0xffffff) - .field(0x404040, 0x808080, 0xffffff); + .border(0xa0a0a0, 0x202020) + .base(0x606060, 0x404040, 0xffffff, 0xefefef) + .field(0x000000, 0x101010, 0xffffff); BLUE - .border(0x0000df, 0x300020) + .border(0x0000bf, 0x200018) .base(0x2020a0, 0x000020, 0x8fffaf, 0x00cfaf) .field(0x505090, 0x406060, 0xcfdfff); CUSTOM - .border(0x000000, 0x000000) + .border(0xd0d0d0, 0x202020) .base(0x808080, 0x808080, 0xffffff, 0xffffff) .field(0x808080, 0x808080, 0xffffff); } diff --git a/client/src/main/java/client/gui/container/GuiContainer.java b/client/src/main/java/client/gui/container/GuiContainer.java index 29a4e441..da685fca 100755 --- a/client/src/main/java/client/gui/container/GuiContainer.java +++ b/client/src/main/java/client/gui/container/GuiContainer.java @@ -824,7 +824,7 @@ public abstract class GuiContainer extends Gui } public void drawBackground() { - Drawing.drawRectBorder(this.container_x, this.container_y, this.container_w, this.container_h, Util.mulColor(Util.mixColor(this.gm.style.fill_top, this.gm.style.fill_btm), 0.8f), 0xff000000, Util.mulColor(this.gm.style.brdr_top, 0.8f), Util.mulColor(this.gm.style.brdr_btm, 0.8f)); + Drawing.drawGradientBorder(this.container_x, this.container_y, this.container_w, this.container_h, Util.mulColor(this.gm.style.fill_top, 0.8f), Util.mulColor(this.gm.style.fill_btm, 0.8f), 0xff000000, Util.mulColor(this.gm.style.brdr_top, 0.8f), Util.mulColor(this.gm.style.brdr_btm, 0.8f)); } diff --git a/client/src/main/java/client/gui/element/GuiList.java b/client/src/main/java/client/gui/element/GuiList.java index 97f3fff0..99e1e053 100755 --- a/client/src/main/java/client/gui/element/GuiList.java +++ b/client/src/main/java/client/gui/element/GuiList.java @@ -146,7 +146,7 @@ public abstract class GuiList extends Gui int y1 = y + z * this.getSlotHeight(); int h = this.getSlotHeight() - 4; - Drawing.drawRectBorder(x, y1 - 2, this.width - SCROLLBAR_WIDTH, this.getSlotHeight(), this.isSelected(z) ? this.gm.style.fill_btm : this.gm.style.fill_top, this.isSelected(z) ? 0xffffffff : 0xff000000, this.gm.style.brdr_top, this.gm.style.brdr_btm); + Drawing.drawGradientBorder(x, y1 - 2, this.width - SCROLLBAR_WIDTH, this.getSlotHeight(), this.isSelected(z) ? this.gm.style.fill_btm : this.gm.style.fill_top, this.isSelected(z) ? this.gm.style.fill_top : this.gm.style.fill_btm, this.isSelected(z) ? 0xffffffff : 0xff000000, this.gm.style.brdr_top, this.gm.style.brdr_btm); boolean hover = canHover && this.getSlotIndexFromScreenCoords(mouseXIn, mouseYIn) == z; this.getListEntry(z).draw(x + 2, y1, this.width - SCROLLBAR_WIDTH - 4, this.getSlotHeight() - 4, mouseXIn - x - 2, mouseYIn - y1, hover); diff --git a/client/src/main/java/client/gui/element/Textbox.java b/client/src/main/java/client/gui/element/Textbox.java index 4e473cf0..715449aa 100644 --- a/client/src/main/java/client/gui/element/Textbox.java +++ b/client/src/main/java/client/gui/element/Textbox.java @@ -243,7 +243,7 @@ abstract class Textbox extends Element { int y2 = this.size_y - (this.margin_y1 + this.margin_y2); this.gm.scissor(x1 < 0 ? 0 : x1, (this.gm.fbY - (y1 + y2)) < 0 ? 0 : (this.gm.fbY - (y1 + y2)), x2 < 0 ? 0 : x2, y2 < 0 ? 0 : y2); GL15.glEnable(GL15.GL_SCISSOR_TEST); - Drawing.drawRect(this.getCursorX(x1, x2), this.getCursorY(y1, y2), 1, Font.HEIGHT, 0xff000000 | (~Util.mixColor(this.gm.style.field_top, this.gm.style.field_btm))); + Drawing.drawRect(this.getCursorX(x1, x2), this.getCursorY(y1, y2), 1, Font.HEIGHT, 0xffffffff); GL15.glDisable(GL15.GL_SCISSOR_TEST); } }