diff --git a/gradle.properties b/gradle.properties index b22e9a6..8f3196b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/src/main/java/io/github/darkkronicle/advancedchathud/config/gui/SharingScreen.java b/src/main/java/io/github/darkkronicle/advancedchathud/config/gui/SharingScreen.java index 52da207..e5ec060 100644 --- a/src/main/java/io/github/darkkronicle/advancedchathud/config/gui/SharingScreen.java +++ b/src/main/java/io/github/darkkronicle/advancedchathud/config/gui/SharingScreen.java @@ -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}. */ @@ -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; diff --git a/src/main/java/io/github/darkkronicle/advancedchathud/gui/ChatWindow.java b/src/main/java/io/github/darkkronicle/advancedchathud/gui/ChatWindow.java index 878f5b5..6a13173 100644 --- a/src/main/java/io/github/darkkronicle/advancedchathud/gui/ChatWindow.java +++ b/src/main/java/io/github/darkkronicle/advancedchathud/gui/ChatWindow.java @@ -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); @@ -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, @@ -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, @@ -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,