From 962cebb29340b3289dc41d4b1c5f011beefb3ab8 Mon Sep 17 00:00:00 2001 From: medisant Date: Thu, 22 Jun 2023 13:04:30 +0200 Subject: [PATCH 1/3] update to 1.20 --- build.gradle | 7 +++--- gradle.properties | 11 +++++---- .../chat/AdvancedChatScreen.java | 12 ++++++---- .../chat/AdvancedTextField.java | 14 +++++------ .../chat/DefaultChatSuggestor.java | 5 ++-- .../config/gui/widgets/WidgetColor.java | 5 ++-- .../gui/widgets/WidgetLabelHoverable.java | 8 ++++--- .../widgets/WidgetRegistryOptionEntry.java | 13 ++++++----- .../advancedchatcore/gui/CleanButton.java | 5 ++-- .../advancedchatcore/gui/ContextMenu.java | 15 ++++++------ .../advancedchatcore/gui/IconButton.java | 9 ++++---- .../gui/WidgetConfigListEntry.java | 23 ++++++++++--------- .../mixin/MixinClientPlayerEntity.java | 8 +++---- src/main/resources/fabric.mod.json | 4 ++-- 14 files changed, 74 insertions(+), 65 deletions(-) diff --git a/build.gradle b/build.gradle index 05ff1fd..457786c 100644 --- a/build.gradle +++ b/build.gradle @@ -21,8 +21,9 @@ if (file("extra.properties").exists()) { repositories { mavenCentral() maven { url 'https://masa.dy.fi/maven' } - maven { url 'https://maven.terraformersmc.com/releases/' } + maven { url 'https://maven.terraformersmc.com/releases/' } maven { url 'https://jitpack.io' } + maven { url 'https://maven.wispforest.io' } } dependencies { @@ -30,8 +31,8 @@ dependencies { mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" - modImplementation "fi.dy.masa.malilib:malilib-fabric-1.19.4:${project.malilib_version}" - modCompileOnly "com.terraformersmc:modmenu:5.0.1" + modImplementation "fi.dy.masa.malilib:malilib-fabric-1.20.1:${project.malilib_version}" + modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}" implementation "com.github.DarkKronicle.Konstruct:addons:${project.konstruct_version}" implementation "com.github.DarkKronicle.Konstruct:core:${project.konstruct_version}" diff --git a/gradle.properties b/gradle.properties index 3461204..0b0b720 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,19 @@ org.gradle.jvmargs=-Xmx1G -minecraft_version=1.19.4 -yarn_mappings=1.19.4+build.1 -loader_version=0.14.18 -fabric_api_version=0.76.0+1.19.4 +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.5 +loader_version=0.14.21 +fabric_api_version=0.84.0+1.20.1 mod_version=1.5.10 maven_group=io.github.darkkronicle archives_base_name=AdvancedChatCore -malilib_version=0.15.2 +malilib_version=0.16.0 konstruct_version=2.0.3-build1 mxparser_version=4.4.2 owo_version=2.0.0 +modmenu_version=7.1.0 # Uploading data curseforge_slug=advancedchatcore diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedChatScreen.java b/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedChatScreen.java index 963e56b..4c87f31 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedChatScreen.java +++ b/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedChatScreen.java @@ -19,6 +19,7 @@ import io.github.darkkronicle.advancedchatcore.util.RowList; import lombok.Getter; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.hud.ChatHud; import net.minecraft.client.option.KeyBinding; import net.minecraft.client.util.InputUtil; @@ -380,18 +381,19 @@ public void setChatFromHistory(int i) { } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { ChatHud hud = client.inGameHud.getChatHud(); this.setFocused(this.chatField); this.chatField.setFocused(true); - this.chatField.render(matrixStack, mouseX, mouseY, partialTicks); - super.render(matrixStack, mouseX, mouseY, partialTicks); + this.chatField.render(context, mouseX, mouseY, partialTicks); + super.render(context, mouseX, mouseY, partialTicks); for (AdvancedChatScreenSection section : sections) { - section.render(matrixStack, mouseX, mouseY, partialTicks); + section.render(context, mouseX, mouseY, partialTicks); } Style style = hud.getTextStyleAt(mouseX, mouseY); if (style != null && style.getHoverEvent() != null) { - this.renderTextHoverEffect(matrixStack, style, mouseX, mouseY); + context.drawHoverEvent(textRenderer, style, mouseX, mouseY); + //this.renderTextHoverEffect(context, style, mouseX, mouseY); } } diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedTextField.java b/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedTextField.java index 7508e4e..b291527 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedTextField.java +++ b/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedTextField.java @@ -16,7 +16,7 @@ import io.github.darkkronicle.advancedchatcore.util.TextBuilder; import io.github.darkkronicle.advancedchatcore.util.TextUtil; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; import net.minecraft.client.gui.widget.TextFieldWidget; @@ -153,7 +153,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) { } @Override - public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float delta) { + public void renderButton(DrawContext context, int mouseX, int mouseY, float delta) { int color = 0xE0E0E0; int cursor = getCursor(); int cursorRow = renderLines.size() - 1; @@ -176,14 +176,14 @@ public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float del } int x = getX(); int y = getY() ; - fill(matrices, getX() - 2, renderY - 2, getX() + width + 4, getY() + height + 4, ConfigStorage.ChatScreen.COLOR.config.get().color()); + context.fill(getX() - 2, renderY - 2, getX() + width + 4, getY() + height + 4, ConfigStorage.ChatScreen.COLOR.config.get().color()); for (int line = 0; line < renderLines.size(); line++) { Text text = renderLines.get(line); if (cursor >= charCount && cursor < text.getString().length() + charCount) { cursorX = textRenderer.getWidth(text.getString().substring(0, cursor - charCount)); cursorRow = line; } - endX = textRenderer.drawWithShadow(matrices, text, x, renderY, color); + endX = context.drawTextWithShadow(textRenderer, text, x, renderY, color); if (selection) { if (!started && selStart >= charCount && selStart <= text.getString().length() + charCount) { started = true; @@ -215,14 +215,14 @@ public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float del } boolean cursorAtEnd = getCursor() == getText().length(); if (!cursorAtEnd && this.suggestion != null) { - this.textRenderer.drawWithShadow(matrices, this.suggestion, endX - 1, y, -8355712); + context.drawTextWithShadow(textRenderer, this.suggestion, endX - 1, y, -8355712); } if (renderCursor) { int cursorY = y - (renderLines.size() - 1 - cursorRow) * (textRenderer.fontHeight + 2); if (cursorAtEnd) { - DrawableHelper.fill(matrices, cursorX, cursorY - 1, cursorX + 1, cursorY + 1 + this.textRenderer.fontHeight, -3092272); + context.fill(cursorX, cursorY - 1, cursorX + 1, cursorY + 1 + this.textRenderer.fontHeight, -3092272); } else { - this.textRenderer.drawWithShadow(matrices, "_", x + cursorX, cursorY, color); + context.drawTextWithShadow(textRenderer, "_", x + cursorX, cursorY, color); } } } diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/chat/DefaultChatSuggestor.java b/src/main/java/io/github/darkkronicle/advancedchatcore/chat/DefaultChatSuggestor.java index e322cf9..f3aedd6 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatcore/chat/DefaultChatSuggestor.java +++ b/src/main/java/io/github/darkkronicle/advancedchatcore/chat/DefaultChatSuggestor.java @@ -11,6 +11,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.ChatInputSuggestor; import net.minecraft.client.util.math.MatrixStack; @@ -36,8 +37,8 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) { } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { - this.commandSuggestor.render(matrixStack, mouseX, mouseY); + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { + this.commandSuggestor.render(context, mouseX, mouseY); } @Override diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/config/gui/widgets/WidgetColor.java b/src/main/java/io/github/darkkronicle/advancedchatcore/config/gui/widgets/WidgetColor.java index dba89f9..432b8e2 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatcore/config/gui/widgets/WidgetColor.java +++ b/src/main/java/io/github/darkkronicle/advancedchatcore/config/gui/widgets/WidgetColor.java @@ -14,6 +14,7 @@ import io.github.darkkronicle.advancedchatcore.util.Colors; import java.util.Optional; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; public class WidgetColor extends GuiTextFieldGeneric { @@ -30,8 +31,8 @@ public WidgetColor( } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { - super.render(matrixStack, mouseX, mouseY, partialTicks); + public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { + super.render(context, mouseX, mouseY, partialTicks); int y = this.y; RenderUtils.drawRect(this.colorX, y, 19, 19, 0xFFFFFFFF); RenderUtils.drawRect(this.colorX + 1, y + 1, 17, 17, 0xFF000000); diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/config/gui/widgets/WidgetLabelHoverable.java b/src/main/java/io/github/darkkronicle/advancedchatcore/config/gui/widgets/WidgetLabelHoverable.java index a9cf898..d472306 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatcore/config/gui/widgets/WidgetLabelHoverable.java +++ b/src/main/java/io/github/darkkronicle/advancedchatcore/config/gui/widgets/WidgetLabelHoverable.java @@ -11,6 +11,8 @@ import fi.dy.masa.malilib.render.RenderUtils; import java.util.Arrays; import java.util.List; + +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; public class WidgetLabelHoverable extends WidgetLabel { @@ -33,8 +35,8 @@ public void setHoverLines(String... hoverLines) { @Override public void postRenderHovered( - int mouseX, int mouseY, boolean selected, MatrixStack matrixStack) { - super.postRenderHovered(mouseX, mouseY, selected, matrixStack); + int mouseX, int mouseY, boolean selected, DrawContext context) { + super.postRenderHovered(mouseX, mouseY, selected, context); if (hoverLines == null) { return; @@ -44,7 +46,7 @@ public void postRenderHovered( && mouseX < this.x + this.width && mouseY >= this.y && mouseY <= this.y + this.height) { - RenderUtils.drawHoverText(mouseX, mouseY, this.hoverLines, matrixStack); + RenderUtils.drawHoverText(mouseX, mouseY, this.hoverLines, context); } } } diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/config/gui/widgets/WidgetRegistryOptionEntry.java b/src/main/java/io/github/darkkronicle/advancedchatcore/config/gui/widgets/WidgetRegistryOptionEntry.java index ea45253..42128ec 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatcore/config/gui/widgets/WidgetRegistryOptionEntry.java +++ b/src/main/java/io/github/darkkronicle/advancedchatcore/config/gui/widgets/WidgetRegistryOptionEntry.java @@ -21,6 +21,7 @@ import java.util.List; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.math.MatrixStack; @@ -75,7 +76,7 @@ private int addOnOffButton(int xRight, int y, ButtonListener.Type type, boolean } @Override - public void render(int mouseX, int mouseY, boolean selected, MatrixStack matrixStack) { + public void render(int mouseX, int mouseY, boolean selected, DrawContext context) { RenderUtils.color(1f, 1f, 1f, 1f); // Draw a lighter background for the hovered and the selected entry @@ -107,20 +108,20 @@ public void render(int mouseX, int mouseY, boolean selected, MatrixStack matrixS this.y + 7, Colors.getInstance().getColorOrWhite("white").color(), name, - matrixStack); + context); RenderUtils.color(1f, 1f, 1f, 1f); RenderSystem.disableBlend(); - super.render(mouseX, mouseY, selected, matrixStack); + super.render(mouseX, mouseY, selected, context); RenderUtils.disableDiffuseLighting(); } @Override public void postRenderHovered( - int mouseX, int mouseY, boolean selected, MatrixStack matrixStack) { - super.postRenderHovered(mouseX, mouseY, selected, matrixStack); + int mouseX, int mouseY, boolean selected, DrawContext context) { + super.postRenderHovered(mouseX, mouseY, selected, context); if (hoverLines == null) { return; @@ -129,7 +130,7 @@ public void postRenderHovered( && mouseX < this.buttonStartX && mouseY >= this.y && mouseY <= this.y + this.height) { - RenderUtils.drawHoverText(mouseX, mouseY, this.hoverLines, matrixStack); + RenderUtils.drawHoverText(mouseX, mouseY, this.hoverLines, context); } } diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/gui/CleanButton.java b/src/main/java/io/github/darkkronicle/advancedchatcore/gui/CleanButton.java index 4da1089..5c2c5a8 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatcore/gui/CleanButton.java +++ b/src/main/java/io/github/darkkronicle/advancedchatcore/gui/CleanButton.java @@ -16,6 +16,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; /** A simple button */ @@ -46,7 +47,7 @@ public CleanButton(int x, int y, int width, int height, Color baseColor, String } @Override - public void render(int mouseX, int mouseY, boolean selected, MatrixStack matrixStack) { + public void render(int mouseX, int mouseY, boolean selected, DrawContext context) { int relMX = mouseX - x; int relMY = mouseY - y; hovered = relMX >= 0 && relMX <= width && relMY >= 0 && relMY <= height; @@ -60,6 +61,6 @@ public void render(int mouseX, int mouseY, boolean selected, MatrixStack matrixS (y + (height / 2) - 3), Colors.getInstance().getColorOrWhite("white").color(), displayString, - matrixStack); + context); } } diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/gui/ContextMenu.java b/src/main/java/io/github/darkkronicle/advancedchatcore/gui/ContextMenu.java index 48004b2..947f10e 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatcore/gui/ContextMenu.java +++ b/src/main/java/io/github/darkkronicle/advancedchatcore/gui/ContextMenu.java @@ -6,8 +6,7 @@ import lombok.Getter; import lombok.Setter; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.DrawableHelper; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; import java.util.LinkedHashMap; @@ -88,23 +87,23 @@ protected boolean onMouseClickedImpl(int mouseX, int mouseY, int mouseButton) { } @Override - public void render(int mouseX, int mouseY, boolean selected, MatrixStack matrixStack) { - drawRect(matrixStack, x, y, width, height, background.color()); + public void render(int mouseX, int mouseY, boolean selected, DrawContext context) { + drawRect(context, x, y, width, height, background.color()); int rX = x + 2; int rY = y + 2; hoveredEntry = null; for (Text option : options.keySet()) { if (mouseX >= x && mouseX <= x + width && mouseY >= rY - 2 && mouseY < rY + fontHeight + 1) { hoveredEntry = option; - drawRect(matrixStack, rX - 2, rY - 2, width, textRenderer.fontHeight + 2, hover.color()); + drawRect(context, rX - 2, rY - 2, width, textRenderer.fontHeight + 2, hover.color()); } - textRenderer.drawWithShadow(matrixStack, option, rX, rY, -1); + context.drawTextWithShadow(textRenderer, option, rX, rY, -1); rY += textRenderer.fontHeight + 2; } } - private static void drawRect(MatrixStack stack, int x, int y, int width, int height, int color) { - DrawableHelper.fill(stack, x, y, x + width, y + height, color); + private static void drawRect(DrawContext context, int x, int y, int width, int height, int color) { + context.fill(x, y, x + width, y + height, color); } public interface ContextConsumer { diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/gui/IconButton.java b/src/main/java/io/github/darkkronicle/advancedchatcore/gui/IconButton.java index 7f5685d..4c3d3f5 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatcore/gui/IconButton.java +++ b/src/main/java/io/github/darkkronicle/advancedchatcore/gui/IconButton.java @@ -6,7 +6,7 @@ import lombok.Getter; import lombok.Setter; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.sound.PositionedSoundInstance; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.sound.SoundEvents; @@ -59,7 +59,7 @@ public IconButton(int x, int y, int width, int height, int padding, int iconWidt } @Override - public void render(int mouseX, int mouseY, boolean unused, MatrixStack matrixStack) { + public void render(int mouseX, int mouseY, boolean unused, DrawContext context) { int relMX = mouseX - x; int relMY = mouseY - y; hovered = relMX >= 0 && relMX <= width && relMY >= 0 && relMY <= height; @@ -73,12 +73,11 @@ public void render(int mouseX, int mouseY, boolean unused, MatrixStack matrixSta RenderUtils.color(1, 1, 1, 1); RenderUtils.bindTexture(icon); - DrawableHelper.drawTexture(matrixStack, x + padding, y + padding, width - (padding * 2), height - (padding * 2), + context.drawTexture(icon, x + padding, y + padding, width - (padding * 2), height - (padding * 2), 0, 0, iconWidth, iconHeight, iconWidth, iconHeight); if (hovered && onHover != null) { - DrawableHelper.drawCenteredTextWithShadow( - matrixStack, + context.drawCenteredTextWithShadow( MinecraftClient.getInstance().textRenderer, onHover, mouseX + 4, diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/gui/WidgetConfigListEntry.java b/src/main/java/io/github/darkkronicle/advancedchatcore/gui/WidgetConfigListEntry.java index ef4bd9c..ae67c9b 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatcore/gui/WidgetConfigListEntry.java +++ b/src/main/java/io/github/darkkronicle/advancedchatcore/gui/WidgetConfigListEntry.java @@ -19,6 +19,7 @@ import lombok.Setter; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; @Environment(EnvType.CLIENT) @@ -59,7 +60,7 @@ public List> getTextFields() { } @Override - public void render(int mouseX, int mouseY, boolean selected, MatrixStack matrixStack) { + public void render(int mouseX, int mouseY, boolean selected, DrawContext context) { RenderUtils.color(1f, 1f, 1f, 1f); // Draw a lighter background for the hovered and the selected entry @@ -86,14 +87,14 @@ public void render(int mouseX, int mouseY, boolean selected, MatrixStack matrixS Colors.getInstance().getColorOrWhite("white").withAlpha(50).color()); } - renderEntry(mouseX, mouseY, selected, matrixStack); + renderEntry(mouseX, mouseY, selected, context); RenderUtils.color(1f, 1f, 1f, 1f); RenderSystem.disableBlend(); - this.drawTextFields(mouseX, mouseY, matrixStack); + this.drawTextFields(mouseX, mouseY, context); - super.render(mouseX, mouseY, selected, matrixStack); + super.render(mouseX, mouseY, selected, context); RenderUtils.disableDiffuseLighting(); } @@ -102,20 +103,20 @@ public void render(int mouseX, int mouseY, boolean selected, MatrixStack matrixS * Render's in the middle of the rendering cycle. After the background, but before it goes to * super. */ - public void renderEntry(int mouseX, int mouseY, boolean selected, MatrixStack matrixStack) { + public void renderEntry(int mouseX, int mouseY, boolean selected, DrawContext context) { String name = getName(); this.drawString( this.x + 4, this.y + 7, Colors.getInstance().getColorOrWhite("white").color(), name, - matrixStack); + context); } @Override public void postRenderHovered( - int mouseX, int mouseY, boolean selected, MatrixStack matrixStack) { - super.postRenderHovered(mouseX, mouseY, selected, matrixStack); + int mouseX, int mouseY, boolean selected, DrawContext context) { + super.postRenderHovered(mouseX, mouseY, selected, context); if (hoverLines == null) { return; } @@ -124,7 +125,7 @@ public void postRenderHovered( && mouseX < this.buttonStartX && mouseY >= this.y && mouseY <= this.y + this.height) { - RenderUtils.drawHoverText(mouseX, mouseY, this.hoverLines, matrixStack); + RenderUtils.drawHoverText(mouseX, mouseY, this.hoverLines, context); } } @@ -181,12 +182,12 @@ protected boolean onMouseClickedImpl(int mouseX, int mouseY, int mouseButton) { return ret; } - protected void drawTextFields(int mouseX, int mouseY, MatrixStack matrixStack) { + protected void drawTextFields(int mouseX, int mouseY, DrawContext context) { if (getTextFields() == null) { return; } for (TextFieldWrapper field : getTextFields()) { - field.getTextField().render(matrixStack, mouseX, mouseY, 0f); + field.getTextField().render(context, mouseX, mouseY, 0f); } } } diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/mixin/MixinClientPlayerEntity.java b/src/main/java/io/github/darkkronicle/advancedchatcore/mixin/MixinClientPlayerEntity.java index 2938fdc..03b97aa 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatcore/mixin/MixinClientPlayerEntity.java +++ b/src/main/java/io/github/darkkronicle/advancedchatcore/mixin/MixinClientPlayerEntity.java @@ -18,7 +18,7 @@ public abstract class MixinClientPlayerEntity extends Entity { @Shadow @Final protected MinecraftClient client; - @Shadow public float nextNauseaStrength; + @Shadow public float nauseaIntensity; public MixinClientPlayerEntity(EntityType type, World world) { super(type, world); @@ -32,9 +32,9 @@ public MixinClientPlayerEntity(EntityType type, World world) { public void updateNauseaHook(CallbackInfo ci) { if (client.currentScreen instanceof AdvancedChatScreen) { ci.cancel(); - nextNauseaStrength += 0.0125f; - if (this.nextNauseaStrength >= 1.0f) { - this.nextNauseaStrength = 1.0f; + nauseaIntensity += 0.0125f; + if (this.nauseaIntensity >= 1.0f) { + this.nauseaIntensity = 1.0f; } inNetherPortal = false; } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 9a18ee3..cb3ce31 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,8 +30,8 @@ "depends": { "fabricloader": ">=0.14.18", "fabric": "*", - "minecraft": ">=1.19.4", - "malilib": ">=0.15.2" + "minecraft": ">=1.20", + "malilib": ">=0.16.0" }, "custom": { "modmenu": { From 4b687a2f8bfbceb778a592bfa5c2cb831ae8e029 Mon Sep 17 00:00:00 2001 From: medisant Date: Wed, 25 Oct 2023 16:39:26 +0200 Subject: [PATCH 2/3] update to 1.20.2 --- build.gradle | 2 +- gradle.properties | 10 ++++---- .../chat/AdvancedChatScreen.java | 23 +++++++++++-------- .../chat/AdvancedTextField.java | 2 +- .../advancedchatcore/chat/MessageOwner.java | 2 +- 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 457786c..a08696f 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,7 @@ dependencies { mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" - modImplementation "fi.dy.masa.malilib:malilib-fabric-1.20.1:${project.malilib_version}" + modImplementation "fi.dy.masa.malilib:malilib-fabric-1.20.2:${project.malilib_version}" modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}" implementation "com.github.DarkKronicle.Konstruct:addons:${project.konstruct_version}" diff --git a/gradle.properties b/gradle.properties index 0b0b720..c424e2c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1,15 @@ org.gradle.jvmargs=-Xmx1G -minecraft_version=1.20.1 -yarn_mappings=1.20.1+build.5 -loader_version=0.14.21 -fabric_api_version=0.84.0+1.20.1 +minecraft_version=1.20.2 +yarn_mappings=1.20.2+build.4 +loader_version=0.14.24 +fabric_api_version=0.90.4+1.20.2 mod_version=1.5.10 maven_group=io.github.darkkronicle archives_base_name=AdvancedChatCore -malilib_version=0.16.0 +malilib_version=0.17.0 konstruct_version=2.0.3-build1 mxparser_version=4.4.2 owo_version=2.0.0 diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedChatScreen.java b/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedChatScreen.java index 4c87f31..cd5ae9f 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedChatScreen.java +++ b/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedChatScreen.java @@ -100,7 +100,11 @@ private Color getColor() { } public void resetCurrentMessage() { - this.messageHistorySize = this.client.inGameHud.getChatHud().getMessageHistory().size(); + try { + this.messageHistorySize = this.client.inGameHud.getChatHud().getMessageHistory().size(); //dont ask + } catch (Exception e) { + e.printStackTrace(); + } } @Override @@ -283,26 +287,27 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) { return false; } - public boolean mouseScrolled(double mouseX, double mouseY, double amount) { - if (amount > 1.0D) { - amount = 1.0D; + @Override + public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) { + if (verticalAmount > 1.0D) { + verticalAmount = 1.0D; } - if (amount < -1.0D) { - amount = -1.0D; + if (verticalAmount < -1.0D) { + verticalAmount = -1.0D; } for (AdvancedChatScreenSection section : sections) { - if (section.mouseScrolled(mouseX, mouseY, amount)) { + if (section.mouseScrolled(mouseX, mouseY, verticalAmount)) { return true; } } if (!hasShiftDown()) { - amount *= 7.0D; + verticalAmount *= 7.0D; } // Send to hud to scroll - client.inGameHud.getChatHud().scroll((int) amount); + client.inGameHud.getChatHud().scroll((int) verticalAmount); return true; } diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedTextField.java b/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedTextField.java index b291527..bb0b360 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedTextField.java +++ b/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedTextField.java @@ -75,7 +75,7 @@ public AdvancedTextField( updateRender(); } - @Override + //@Override public void tick() { focusedTicks++; } diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/chat/MessageOwner.java b/src/main/java/io/github/darkkronicle/advancedchatcore/chat/MessageOwner.java index b98feca..962cc58 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatcore/chat/MessageOwner.java +++ b/src/main/java/io/github/darkkronicle/advancedchatcore/chat/MessageOwner.java @@ -34,6 +34,6 @@ public class MessageOwner { * @return Identifier with texture data */ public Identifier getTexture() { - return entry.getSkinTexture(); + return entry.getSkinTextures().texture(); } } From f38f9f82de7e7ba29a5ac6f9a02b07840216416f Mon Sep 17 00:00:00 2001 From: medisant Date: Wed, 10 Jan 2024 21:13:39 +0100 Subject: [PATCH 3/3] update to 1.20.4 --- gradle.properties | 8 ++++---- .../advancedchatcore/chat/AdvancedTextField.java | 3 ++- .../advancedchatcore/config/gui/widgets/WidgetColor.java | 4 ++-- .../darkkronicle/advancedchatcore/util/RawText.java | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index c424e2c..ab07351 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ org.gradle.jvmargs=-Xmx1G -minecraft_version=1.20.2 -yarn_mappings=1.20.2+build.4 -loader_version=0.14.24 -fabric_api_version=0.90.4+1.20.2 +minecraft_version=1.20.4 +yarn_mappings=1.20.4+build.3 +loader_version=0.15.3 +fabric_api_version=0.92.0+1.20.4 mod_version=1.5.10 maven_group=io.github.darkkronicle diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedTextField.java b/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedTextField.java index bb0b360..a5bdcae 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedTextField.java +++ b/src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedTextField.java @@ -152,8 +152,9 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) { return super.mouseClicked(mouseX, mouseY, button); } + @Override - public void renderButton(DrawContext context, int mouseX, int mouseY, float delta) { + public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) { int color = 0xE0E0E0; int cursor = getCursor(); int cursorRow = renderLines.size() - 1; diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/config/gui/widgets/WidgetColor.java b/src/main/java/io/github/darkkronicle/advancedchatcore/config/gui/widgets/WidgetColor.java index 432b8e2..5ff79aa 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatcore/config/gui/widgets/WidgetColor.java +++ b/src/main/java/io/github/darkkronicle/advancedchatcore/config/gui/widgets/WidgetColor.java @@ -31,8 +31,8 @@ public WidgetColor( } @Override - public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) { - super.render(context, mouseX, mouseY, partialTicks); + public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) { + super.renderWidget(context, mouseX, mouseY, delta); int y = this.y; RenderUtils.drawRect(this.colorX, y, 19, 19, 0xFFFFFFFF); RenderUtils.drawRect(this.colorX + 1, y + 1, 17, 17, 0xFF000000); diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/util/RawText.java b/src/main/java/io/github/darkkronicle/advancedchatcore/util/RawText.java index 9fd3830..85ef30c 100644 --- a/src/main/java/io/github/darkkronicle/advancedchatcore/util/RawText.java +++ b/src/main/java/io/github/darkkronicle/advancedchatcore/util/RawText.java @@ -15,7 +15,7 @@ public Style getStyle() { @Override public TextContent getContent() { - return new LiteralTextContent(content); + return PlainTextContent.of(content); } @Override