Skip to content

Patch two rendering issues introduced by the 1.21.3 update #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NotRyken wants to merge 3 commits into
base: 1.21.4
Choose a base branch
from
Open

Patch two rendering issues introduced by the 1.21.3 update #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0d2ac2
Fix chat window button icons not rendering
NotRyken Dec 28, 2024
33dea06
Fix chat window render interfering with status effect icons
NotRyken Dec 28, 2024
c519c19
Fix config screen resizing issues
NotRyken Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ yarn_mappings=1.21.3+build.2
loader_version=0.15.11
fabric_api_version=0.112.1+1.21.3

mod_version=1.3.11
mod_version=1.3.13
maven_group=com.arematics
archives_base_name=AdvancedChatHUD

Expand Down
9 changes: 9 additions & 0 deletions src/main/java/io/github/darkkronicle/advancedchathud/config/gui/SharingScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import io.github.darkkronicle.advancedchathud.AdvancedChatHud;
import io.github.darkkronicle.advancedchathud.config.ChatTab;
import io.github.darkkronicle.advancedchathud.config.HudConfigStorage;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.Screen;

/** Screen for importing and exporting {@link ChatTab}. */
Expand All @@ -40,6 +41,14 @@ public static SharingScreen fromTab(ChatTab tab, Screen parent) {
return new SharingScreen(GSON.toJson(tabJsonSave.save(tab)), parent);
}

@Override
public void resize(MinecraftClient mc, int width, int height) {
this.width = width;
this.height = height;
this.clearElements();
this.clearAndInit();
}

@Override
public void init() {
int x = this.width / 2 - 150;
Expand Down
28 changes: 16 additions & 12 deletions src/main/java/io/github/darkkronicle/advancedchathud/gui/ChatWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,12 +340,16 @@ public void render(DrawContext context, int ticks, boolean focused) {
getScaledHeight() - HudConfigStorage.General.TOP_PAD.config.getIntegerValue() + (HudConfigStorage.General.MESSAGE_SPACE.config.getIntegerValue() + HudConfigStorage.General.LINE_SPACE.config.getIntegerValue() * (renderTopFirst ? 2 : 1)),
renderTopFirst ? HudConfigStorage.General.TOP_PAD.config.getIntegerValue() + HudConfigStorage.General.LINE_SPACE.config.getIntegerValue(): HudConfigStorage.General.BOTTOM_PAD.config.getIntegerValue());

double scale = client.getWindow().getScaleFactor();
ScissorUtil.applyScissorBox(
(int) (getConvertedX() * scale),
(int) ((client.getWindow().getScaledHeight() - getConvertedY()) * scale),
(int) (getConvertedWidth() * scale),
(int) (getConvertedHeight() * scale));
// Disabled in 1.21.3+ due to interfering with status effect icons.
// Unsure of original intended function.
// - NotRyken
// double scale = client.getWindow().getScaleFactor();
// ScissorUtil.applyScissorBox(
// (int) (getConvertedX() * scale),
// (int) ((client.getWindow().getScaledHeight() - getConvertedY()) * scale),
// (int) (getConvertedWidth() * scale),
// (int) (getConvertedHeight() * scale));

boolean foundScroll = false;
for (int j = 0; j < this.lines.size(); j++) {
ChatMessage message = this.lines.get(j);
Expand Down Expand Up @@ -482,10 +486,10 @@ public void render(DrawContext context, int ticks, boolean focused) {
X_ICON,
rightX - scaledBar + 1,
getActualY(newY - 1),
scaledBar - 2,
scaledBar - 2,
0,
0,
scaledBar - 2,
scaledBar - 2,
32,
32,
32,
Expand All @@ -499,10 +503,10 @@ public void render(DrawContext context, int ticks, boolean focused) {
RESIZE_ICON,
rightX - scaledBar * 2 + 2,
getActualY(newY - 1),
scaledBar - 2,
scaledBar - 2,
0,
0,
scaledBar - 2,
scaledBar - 2,
32,
32,
32,
Expand All @@ -515,10 +519,10 @@ public void render(DrawContext context, int ticks, boolean focused) {
visibility.getTexture(),
rightX - scaledBar * 3 + 3,
getActualY(newY - 1),
scaledBar - 2,
scaledBar - 2,
0,
0,
scaledBar - 2,
scaledBar - 2,
32,
32,
32,
Expand Down