fix another few bugs

Author: moehreag

1.16_combat-6/build.gradle.kts

@@ -54,10 +54,10 @@ dependencies {
 	implementation(include("org.slf4j:slf4j-api:1.7.36")!!)
 	localRuntime("org.slf4j:slf4j-jdk14:1.7.36")
 
-	api("org.lwjgl:lwjgl-nanovg:3.2.2")
-	runtimeOnly("org.lwjgl:lwjgl-nanovg:3.2.2:natives-linux")
-	runtimeOnly("org.lwjgl:lwjgl-nanovg:3.2.2:natives-windows")
-	runtimeOnly("org.lwjgl:lwjgl-nanovg:3.2.2:natives-macos")
+	api("org.lwjgl:lwjgl-nanovg:3.3.2")
+	runtimeOnly("org.lwjgl:lwjgl-nanovg:3.3.2:natives-linux")
+	runtimeOnly("org.lwjgl:lwjgl-nanovg:3.3.2:natives-windows")
+	runtimeOnly("org.lwjgl:lwjgl-nanovg:3.3.2:natives-macos")
 }
 
 tasks.processResources {

1.8.9/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/ChatHud.java

@@ -104,7 +104,6 @@ public void render(float delta) {
 			int i = getVisibleLineCount();
 			int j = 0;
 			int k = visibleMessages.size();
-			float f = this.client.options.chatOpacity * 0.9F + 0.1F;
 			if (k > 0) {
 				float g = getScale();
 				int l = MathHelper.ceil((float) getWidth() / g);
@@ -123,20 +122,27 @@ public void render(float delta) {
 							if (animateChat.get() && m+scrolledLines < newLines) {
 								d *= animationPercent;
 							}
-							int Opacity = isChatFocused() ? 255 : (int) (255.0 * d);
 
-							int chatOpacity = (int) (Opacity * f);
 							++j;
-							if (chatOpacity > 3) {
+							int opacity = (int) (Math.max(bgColor.get().getAlpha(), textColor.get().getAlpha()) * d);
+							if (opacity > 3) {
 								int y = pos.y + getHeight() - (m * (9 + lineSpacing.get()));
 								if (background.get()) {
+									int bg = bgColor.get().toInt();
+									if (!isChatFocused()) {
+										bg += ((int)((bg >> 24) * d)) << 24;
+									}
 									fill(pos.x, y - (9 + lineSpacing.get()), pos.x + l + 4, y,
-										bgColor.get().withAlpha(chatOpacity / 2).toInt());
+										bg);
 								}
 								String string = chatHudLine.getText().getFormattedString();
 								GlStateManager.enableBlend();
+								int text = textColor.get().toInt();
+								if (!isChatFocused()) {
+									text += ((int)((text >> 24) * d)) << 24;
+								}
 								DrawUtil.drawString(string, pos.x, (y - 8),
-									16777215 + (chatOpacity << 24), shadow.get());
+									text, shadow.get());
 								GlStateManager.disableAlphaTest();
 								GlStateManager.disableBlend();
 							}

gradle.properties

@@ -6,7 +6,7 @@ org.gradle.parallel=true
 axolotlclient.modules.all=true
 
 # Mod Properties
-version=3.1.1-rc.7
+version=3.1.1-rc.8
 
 maven_group=io.github.axolotlclient
 
@@ -33,4 +33,4 @@ osl=0.16.1
 
 legacy_lwgjl3=1.2.3+1.8.9
 
-config=3.0.3
+config=3.0.4