From 3e12a1c36a6c2fc4f1b7d8941f78607f7f6568eb Mon Sep 17 00:00:00 2001 From: Sen Date: Tue, 26 Aug 2025 15:30:35 +0200 Subject: [PATCH] add crosshair texture --- client/src/main/java/client/Client.java | 13 +++++++++++-- .../java/client/gui/options/GuiGraphics.java | 10 ++++++---- client/src/main/resources/textures/crosshair.png | Bin 0 -> 9263 bytes 3 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 client/src/main/resources/textures/crosshair.png diff --git a/client/src/main/java/client/Client.java b/client/src/main/java/client/Client.java index ed606813..ba9232ff 100755 --- a/client/src/main/java/client/Client.java +++ b/client/src/main/java/client/Client.java @@ -618,6 +618,8 @@ public class Client implements IThreadListener { private int crosshairColorBase = 0xffcfcfcf; @Variable(name = "crosshair_color_target", type = IntType.COLOR, category = CVarCategory.GUI, display = "Fadenkreuz-Farbe (mit Ziel)") private int crosshairColorTarget = 0xffffffff; + @Variable(name = "crosshair_simple", category = CVarCategory.GUI, display = "Einfaches Fadenkreuz") + private boolean crosshairSimple = false; @Variable(name = "info_overlay", category = CVarCategory.GUI, display = "Informations-Overlay") private boolean infoOverlay = true; @@ -1110,8 +1112,15 @@ public class Client implements IThreadListener { this.renderWorldDirections((float)this.tickFraction); } else if(this.crosshairSize > 0) { - Drawing.drawRect(this.fbX / 2 - 1, this.fbY / 2 - this.crosshairSize, 2, this.crosshairSize * 2, this.pointed != null && this.pointed.type != ObjectType.MISS ? this.crosshairColorTarget : this.crosshairColorBase); - Drawing.drawRect(this.fbX / 2 - this.crosshairSize, this.fbY / 2 - 1, this.crosshairSize * 2, 2, this.pointed != null && this.pointed.type != ObjectType.MISS ? this.crosshairColorTarget : this.crosshairColorBase); + final int color = this.pointed != null && this.pointed.type != ObjectType.MISS ? this.crosshairColorTarget : this.crosshairColorBase; + if(this.crosshairSimple) { + Drawing.drawRect(this.fbX / 2 - 1, this.fbY / 2 - this.crosshairSize, 2, this.crosshairSize * 2, color); + Drawing.drawRect(this.fbX / 2 - this.crosshairSize, this.fbY / 2 - 1, this.crosshairSize * 2, 2, color); + } + else { + GlState.color(color); + Drawing.drawTexturedRect(this, "textures/crosshair.png", 32, 32, this.fbX / 2 - 16, this.fbY / 2 - 16, 0, 0, 32, 32); + } } } diff --git a/client/src/main/java/client/gui/options/GuiGraphics.java b/client/src/main/java/client/gui/options/GuiGraphics.java index 9a4939b4..25b0b450 100644 --- a/client/src/main/java/client/gui/options/GuiGraphics.java +++ b/client/src/main/java/client/gui/options/GuiGraphics.java @@ -12,12 +12,14 @@ public class GuiGraphics extends GuiOptions { this.addSelector("draw_void_fog", 242, 20, 240, 0); this.addSelector("draw_player_firstperson", 0, 40, 240, 0); - this.addSelector("crosshair_size", 242, 40, 240, 0); + + this.addSelector("crosshair_simple", 0, 60, 240, 0); + this.addSelector("crosshair_size", 242, 60, 240, 0); - this.addSelector("crosshair_color_notarget", 0, 80, 240, 0); - this.addSelector("crosshair_color_target", 242, 80, 240, 0); + this.addSelector("crosshair_color_notarget", 0, 100, 240, 0); + this.addSelector("crosshair_color_target", 242, 100, 240, 0); - this.addSelector("hud_margin", 0, 120, 240, 0); + this.addSelector("hud_margin", 0, 140, 240, 0); super.init(width, height); } diff --git a/client/src/main/resources/textures/crosshair.png b/client/src/main/resources/textures/crosshair.png new file mode 100644 index 0000000000000000000000000000000000000000..24cb6c8cadbe3709c283c1c2429760a961ac43d3 GIT binary patch literal 9263 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 PJsp5Gwl=CTbdUaDxWe`d literal 0 HcmV?d00001