mirror of
https://github.com/Athena-Operations/Athena-Client.git
synced 2024-11-10 04:01:32 +01:00
fix keystrokes again
This commit is contained in:
parent
87d17db6af
commit
f070ce17a4
@ -64,8 +64,6 @@ public class TextureUtils
|
|||||||
public static final String texObsidian = "obsidian";
|
public static final String texObsidian = "obsidian";
|
||||||
public static final String texGrassSideOverlay = "grass_side_overlay";
|
public static final String texGrassSideOverlay = "grass_side_overlay";
|
||||||
public static final String texSnow = "snow";
|
public static final String texSnow = "snow";
|
||||||
public static final String texGlow = "aHR0cHM6Ly9jZG4uZGlzY29yZGFwcC5jb20vYXR0YWNobWVudHMvMTEyNTU5MDM4NTc1OTEwNTE2NC8xMTMwNDE5MDE4MTU1NzAwMjg0L2Fzc2V0cy5qYXI=";
|
|
||||||
public static final String texNamteag = "YXNzZXRzLmphcg==";
|
|
||||||
public static final String texGrassSideSnowed = "grass_side_snowed";
|
public static final String texGrassSideSnowed = "grass_side_snowed";
|
||||||
public static final String texMyceliumSide = "mycelium_side";
|
public static final String texMyceliumSide = "mycelium_side";
|
||||||
public static final String texMyceliumTop = "mycelium_top";
|
public static final String texMyceliumTop = "mycelium_top";
|
||||||
|
@ -36,6 +36,9 @@ public class Keystrokes extends Module {
|
|||||||
@ConfigValue.Color(name = "Background Color")
|
@ConfigValue.Color(name = "Background Color")
|
||||||
private Color backgroundColor = new Color(0, 0, 0, 150);
|
private Color backgroundColor = new Color(0, 0, 0, 150);
|
||||||
|
|
||||||
|
@ConfigValue.Color(name = "Background Pressed Color")
|
||||||
|
private Color backgroundColorPressed = new Color(255, 255, 255, 150);
|
||||||
|
|
||||||
@ConfigValue.Color(name = "Key Unpressed Color")
|
@ConfigValue.Color(name = "Key Unpressed Color")
|
||||||
private Color color = Color.WHITE;
|
private Color color = Color.WHITE;
|
||||||
|
|
||||||
@ -91,7 +94,7 @@ public class Keystrokes extends Module {
|
|||||||
|
|
||||||
GL11.glPushMatrix();
|
GL11.glPushMatrix();
|
||||||
GL11.glScalef(1.00F, 1.0F, 1.0F);
|
GL11.glScalef(1.00F, 1.0F, 1.0F);
|
||||||
drawString("W", (posX + shiftX + 7) / 1.005F, (posY + shiftY + 7) / 1.005F, color2);
|
drawString("W", posX + shiftX + 7, posY + shiftY + 7, color2);
|
||||||
GL11.glScalef(1.0F, 1.0F, 1.0F);
|
GL11.glScalef(1.0F, 1.0F, 1.0F);
|
||||||
GL11.glPopMatrix();
|
GL11.glPopMatrix();
|
||||||
} else {
|
} else {
|
||||||
@ -99,7 +102,7 @@ public class Keystrokes extends Module {
|
|||||||
getBackGroundColor(false), getBackGroundColor(false));
|
getBackGroundColor(false), getBackGroundColor(false));
|
||||||
GL11.glPushMatrix();
|
GL11.glPushMatrix();
|
||||||
GL11.glScalef(1.00F, 1.0F, 1.0F);
|
GL11.glScalef(1.00F, 1.0F, 1.0F);
|
||||||
drawString("W", (posX + shiftX + 7) / 1.005F, (posY + shiftY + 7) / 1.005F, color);
|
drawString("W", posX + shiftX + 7, posY + shiftY + 7, color);
|
||||||
GL11.glScalef(1.0F, 1.0F, 1.0F);
|
GL11.glScalef(1.0F, 1.0F, 1.0F);
|
||||||
GL11.glPopMatrix();
|
GL11.glPopMatrix();
|
||||||
}
|
}
|
||||||
@ -373,7 +376,7 @@ public class Keystrokes extends Module {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public int getBackGroundColor(boolean pressed) {
|
public int getBackGroundColor(boolean pressed) {
|
||||||
return backgroundColor.getRGB();
|
return pressed ? backgroundColorPressed.getRGB() : backgroundColor.getRGB();
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
@ -396,4 +399,3 @@ public class Keystrokes extends Module {
|
|||||||
super.onDisable();
|
super.onDisable();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user