Skip to content

Commit bbddd93

Browse files
committed
update to 1.20
1 parent 25ef1c1 commit bbddd93

5 files changed

Lines changed: 30 additions & 20 deletions

File tree

build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ if (file("extra.properties").exists()) {
2323

2424
repositories {
2525
mavenCentral()
26+
mavenLocal() // only used to build the mod locally
2627
maven { url 'https://masa.dy.fi/maven' }
2728
maven { url 'https://jitpack.io' }
2829
}
@@ -32,8 +33,9 @@ dependencies {
3233
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
3334
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
3435
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
35-
modImplementation "fi.dy.masa.malilib:malilib-fabric-1.19.0:${project.malilib_version}"
36-
modImplementation "com.github.DarkKronicle:AdvancedChatCore:${project.advancedchat_version}"
36+
modImplementation "fi.dy.masa.malilib:malilib-fabric-1.20.1:${project.malilib_version}"
37+
//modImplementation "com.github.DarkKronicle:AdvancedChatCore:${project.advancedchat_version}"
38+
modImplementation "io.github.darkkronicle:AdvancedChatCore:1.20.1-1.5.10" // only used to build the mod locally
3739
}
3840

3941

gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
minecraft_version=1.19
2-
yarn_mappings=1.19+build.4
3-
loader_version=0.14.8
4-
fabric_api_version=0.57.0+1.19
1+
minecraft_version=1.20.1
2+
yarn_mappings=1.20.1+build.5
3+
loader_version=0.14.21
4+
fabric_api_version=0.84.0+1.20.1
55

66
# Mod Properties
77
mod_version=1.2.3
88
maven_group=io.github.darkkronicle
99
archives_base_name=AdvancedChatLog
10-
malilib_version=0.13.0
10+
malilib_version=0.16.0
1111
org.gradle.jvmargs=-Xmx1G
1212
advancedchat_version=1.5.2-build1

src/main/java/io/github/darkkronicle/advancedchatlog/gui/ChatLogScreen.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import net.fabricmc.api.EnvType;
3232
import net.fabricmc.api.Environment;
3333
import net.minecraft.client.MinecraftClient;
34+
import net.minecraft.client.gui.DrawContext;
3435
import net.minecraft.client.util.math.MatrixStack;
3536
import net.minecraft.text.Style;
3637
import net.minecraft.text.Text;
@@ -120,7 +121,9 @@ public void initGui() {
120121
12,
121122
textRenderer,
122123
(textFieldRunnable -> {
123-
client.player.sendChatMessage(textFieldRunnable.getText());
124+
if (client.player != null) {
125+
client.player.sendMessage(Text.of(textFieldRunnable.getText()));
126+
}
124127
textFieldRunnable.setText("");
125128
})
126129
);
@@ -256,8 +259,8 @@ public boolean onMouseScrolled(int mouseX, int mouseY, double mouseWheelDelta) {
256259
}
257260

258261
@Override
259-
public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) {
260-
super.render(matrixStack, mouseX, mouseY, partialTicks);
262+
public void render(DrawContext context, int mouseX, int mouseY, float partialTicks) {
263+
super.render(context, mouseX, mouseY, partialTicks);
261264
updateScroll();
262265
int height = client.getWindow().getScaledHeight();
263266
int width = client.getWindow().getScaledWidth();
@@ -281,26 +284,25 @@ public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partia
281284
break;
282285
}
283286
ChatMessage.AdvancedChatLine line = renderLines.get(i);
284-
textRenderer.drawWithShadow(
285-
matrixStack,
287+
context.drawTextWithShadow(
288+
textRenderer,
286289
line.getText(),
287290
10,
288291
height - y - 40 - fontHeight,
289292
Colors.getInstance().getColorOrWhite("white").color());
290293
y += lineHeight;
291294
}
292295
ScissorUtil.resetScissor();
293-
drawCenteredText(
294-
matrixStack,
296+
context.drawCenteredTextWithShadow(
295297
textRenderer,
296298
(scrollLine + 1) + "/" + renderLines.size(),
297299
width / 2,
298300
height - 28,
299301
Colors.getInstance().getColorOrWhite("white").color()
300302
);
301-
renderTextHoverEffect(matrixStack, getHoverStyle(mouseX, mouseY), mouseX, mouseY);
303+
context.drawHoverEvent(textRenderer, getHoverStyle(mouseX, mouseY), mouseX, mouseY);
302304
if (menu != null) {
303-
menu.render(mouseX, mouseY, true, matrixStack);
305+
menu.render(mouseX, mouseY, true, context);
304306
}
305307
}
306308

src/main/java/io/github/darkkronicle/advancedchatlog/gui/ChatLogScreenSection.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import net.fabricmc.api.EnvType;
2020
import net.fabricmc.api.Environment;
2121
import net.minecraft.client.MinecraftClient;
22+
import net.minecraft.client.gui.DrawContext;
2223
import net.minecraft.util.Identifier;
2324

2425
@Environment(EnvType.CLIENT)
@@ -39,4 +40,9 @@ public void initGui() {
3940
)
4041
);
4142
}
43+
44+
@Override
45+
public void render(DrawContext context, int mouseX, int mouseY, float delta) {
46+
47+
}
4248
}

src/main/resources/fabric.mod.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
"advancedchatlog.mixins.json"
2525
],
2626
"depends": {
27-
"fabricloader": ">=0.8.9+build.204",
27+
"fabricloader": ">=0.14.18",
2828
"fabric": "*",
29-
"minecraft": ">=1.17.0",
30-
"malilib": ">=0.13.0",
31-
"advancedchatcore": ">=1.4.0-1.18"
29+
"minecraft": ">=1.20.0",
30+
"malilib": ">=0.16.0",
31+
"advancedchatcore": ">=1.5.10-1.19"
3232
},
3333
"custom": {
3434
"acmodule": true,

0 commit comments

Comments
 (0)