Skip to content
This repository was archived by the owner on Sep 19, 2024. It is now read-only.

Commit 2642955

Browse files
author
Kale-Ko
committed
Update to 1.19
1 parent 4ac049b commit 2642955

22 files changed

+353
-873
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
lib/
66
run/
77
out/
8+
bin/
89
build/
910
.gradle/
1011
classes/

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dependencies {
3131
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
3232
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
3333
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
34-
modImplementation "fi.dy.masa.malilib:malilib-fabric-1.18.2:${project.malilib_version}"
34+
modImplementation "fi.dy.masa.malilib:malilib-fabric-1.19.0:${project.malilib_version}"
3535
modCompileOnly "io.github.prospector:modmenu:1.16.8"
3636

3737
modImplementation "com.github.DarkKronicle:KommandLib:${project.kommandlib_version}"

‎gradle.properties

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
org.gradle.jvmargs=-Xmx1G
22

3-
minecraft_version=1.18.2
4-
yarn_mappings=1.18.2+build.1
5-
loader_version=0.13.3
6-
fabric_api_version=0.47.9+1.18.2
3+
minecraft_version=1.19
4+
yarn_mappings=1.19+build.4
5+
loader_version=0.14.8
6+
fabric_api_version=0.57.0+1.19
77

8-
mod_version=1.5.0
8+
mod_version=1.6.0
99
maven_group=io.github.darkkronicle
1010
archives_base_name=AdvancedChatCore
1111

1212
kommandlib_version=1.0.0-build2
13-
malilib_version = 0.12.0
13+
malilib_version=0.13.0
1414
konstruct_version=2.0.3-build1
1515
mxparser_version=4.4.2
1616
owo_version=2.0.0

‎src/main/java/io/github/darkkronicle/advancedchatcore/AdvancedChatCore.java

-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import fi.dy.masa.malilib.event.InitializationHandler;
1111
import fi.dy.masa.malilib.gui.GuiBase;
1212
import io.github.darkkronicle.advancedchatcore.chat.AdvancedSleepingChatScreen;
13-
import io.github.darkkronicle.advancedchatcore.config.gui.GuiConfigHandler;
1413
import io.github.darkkronicle.advancedchatcore.util.Colors;
1514
import io.github.darkkronicle.advancedchatcore.util.SyncTaskQueue;
1615
import java.io.FileInputStream;
@@ -24,13 +23,9 @@
2423
import net.fabricmc.api.EnvType;
2524
import net.fabricmc.api.Environment;
2625
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
27-
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
2826
import net.minecraft.client.MinecraftClient;
29-
import net.minecraft.client.option.KeyBinding;
30-
import net.minecraft.client.util.InputUtil;
3127
import org.apache.logging.log4j.LogManager;
3228
import org.apache.logging.log4j.Logger;
33-
import org.lwjgl.glfw.GLFW;
3429

3530
@Environment(EnvType.CLIENT)
3631
public class AdvancedChatCore implements ClientModInitializer {

‎src/main/java/io/github/darkkronicle/advancedchatcore/InitHandler.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,18 @@
2323
import io.github.darkkronicle.advancedchatcore.finder.CustomFinder;
2424
import io.github.darkkronicle.advancedchatcore.finder.custom.ProfanityFinder;
2525
import io.github.darkkronicle.advancedchatcore.hotkeys.InputHandler;
26-
import io.github.darkkronicle.advancedchatcore.util.FluidText;
2726
import io.github.darkkronicle.advancedchatcore.util.ProfanityUtil;
27+
import io.github.darkkronicle.advancedchatcore.util.StringInsert;
2828
import io.github.darkkronicle.advancedchatcore.util.StringMatch;
29-
29+
import io.github.darkkronicle.advancedchatcore.util.TextUtil;
3030
import java.util.*;
3131

3232
import net.fabricmc.api.EnvType;
3333
import net.fabricmc.api.Environment;
3434
import net.minecraft.client.MinecraftClient;
3535
import net.minecraft.client.render.BufferRenderer;
36+
import net.minecraft.text.LiteralTextContent;
37+
import net.minecraft.text.MutableText;
3638

3739
@Environment(EnvType.CLIENT)
3840
public class InitHandler implements IInitializationHandler {
@@ -70,14 +72,14 @@ public void registerModHandlers() {
7072
if (profanity.size() == 0) {
7173
return Optional.empty();
7274
}
73-
Map<StringMatch, FluidText.StringInsert> insertions =
75+
Map<StringMatch, StringInsert> insertions =
7476
new HashMap<>();
7577
for (StringMatch bad : profanity) {
7678
insertions.put(bad, (current, match) ->
77-
new FluidText(current.withMessage("*".repeat(bad.end - bad.start)))
79+
MutableText.of(new LiteralTextContent("*".repeat(bad.end - bad.start))).fillStyle(current.getStyle())
7880
);
7981
}
80-
text.replaceStrings(insertions);
82+
TextUtil.replaceStrings(text, insertions);
8183
return Optional.of(text);
8284
}
8385
return Optional.empty();

‎src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedChatScreen.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,12 @@
2424
import lombok.Getter;
2525
import net.minecraft.client.MinecraftClient;
2626
import net.minecraft.client.gui.hud.ChatHud;
27-
import net.minecraft.client.input.Input;
2827
import net.minecraft.client.option.KeyBinding;
2928
import net.minecraft.client.util.InputUtil;
3029
import net.minecraft.client.util.math.MatrixStack;
3130
import net.minecraft.text.MutableText;
3231
import net.minecraft.text.Style;
33-
import net.minecraft.text.TranslatableText;
32+
import net.minecraft.text.Text;
3433
import net.minecraft.util.Identifier;
3534
import net.minecraft.util.math.MathHelper;
3635

@@ -113,7 +112,7 @@ public void initGui() {
113112
this.height - 12,
114113
this.width - 4,
115114
12,
116-
new TranslatableText("chat.editBox")) {
115+
Text.translatable("chat.editBox")) {
117116
protected MutableText getNarrationMessage() {
118117
return null;
119118
}
@@ -307,7 +306,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
307306
if (hud.mouseClicked(mouseX, mouseY)) {
308307
return true;
309308
}
310-
Style style = hud.getText(mouseX, mouseY);
309+
Style style = hud.getTextStyleAt(mouseX, mouseY);
311310
if (style != null && style.getClickEvent() != null) {
312311
if (this.handleTextClick(style)) {
313312
return true;
@@ -381,7 +380,7 @@ public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partia
381380
for (AdvancedChatScreenSection section : sections) {
382381
section.render(matrixStack, mouseX, mouseY, partialTicks);
383382
}
384-
Style style = hud.getText(mouseX, mouseY);
383+
Style style = hud.getTextStyleAt(mouseX, mouseY);
385384
if (style != null && style.getHoverEvent() != null) {
386385
this.renderTextHoverEffect(matrixStack, style, mouseX, mouseY);
387386
}

‎src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedSleepingChatScreen.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021 DarkKronicle
2+
* Copyright (C) 2021-2022 DarkKronicle
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -42,7 +42,7 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
4242
} else if (keyCode == KeyCodes.KEY_ENTER || keyCode == KeyCodes.KEY_KP_ENTER) {
4343
String string = this.chatField.getText().trim();
4444
if (!string.isEmpty()) {
45-
this.sendMessage(string);
45+
MessageSender.getInstance().sendMessage(string);
4646
}
4747

4848
this.chatField.setText("");

‎src/main/java/io/github/darkkronicle/advancedchatcore/chat/ChatHistoryProcessor.java

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021 DarkKronicle
2+
* Copyright (C) 2021-2022 DarkKronicle
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -12,14 +12,17 @@
1212
import io.github.darkkronicle.advancedchatcore.interfaces.IMessageProcessor;
1313
import io.github.darkkronicle.advancedchatcore.mixin.MixinChatHudInvoker;
1414
import io.github.darkkronicle.advancedchatcore.util.Color;
15-
import io.github.darkkronicle.advancedchatcore.util.FluidText;
1615
import io.github.darkkronicle.advancedchatcore.util.SearchUtils;
1716
import java.time.LocalTime;
1817
import java.time.format.DateTimeFormatter;
1918
import net.fabricmc.api.EnvType;
2019
import net.fabricmc.api.Environment;
2120
import net.minecraft.client.MinecraftClient;
21+
import net.minecraft.text.LiteralTextContent;
22+
import net.minecraft.text.MutableText;
23+
import net.minecraft.text.Style;
2224
import net.minecraft.text.Text;
25+
import net.minecraft.text.TextColor;
2326
import org.jetbrains.annotations.Nullable;
2427

2528
@Environment(EnvType.CLIENT)
@@ -35,11 +38,10 @@ private static boolean sendToHud(Text text) {
3538
}
3639

3740
@Override
38-
public boolean process(FluidText text, @Nullable FluidText unfiltered) {
41+
public boolean process(Text text, @Nullable Text unfiltered) {
3942
if (unfiltered == null) {
4043
unfiltered = text;
4144
}
42-
Color backcolor = text.getBackground();
4345

4446
// Put the time in
4547
LocalTime time = LocalTime.now();
@@ -50,7 +52,13 @@ public boolean process(FluidText text, @Nullable FluidText unfiltered) {
5052
DateTimeFormatter format =
5153
DateTimeFormatter.ofPattern(
5254
ConfigStorage.General.TIME_FORMAT.config.getStringValue());
53-
text.addTime(format, time);
55+
String replaceFormat =
56+
ConfigStorage.General.TIME_TEXT_FORMAT.config.getStringValue().replaceAll("&", "§");
57+
Color color = ConfigStorage.General.TIME_COLOR.config.get();
58+
Style style = Style.EMPTY;
59+
TextColor textColor = TextColor.fromRgb(color.color());
60+
style = style.withColor(textColor);
61+
text.getSiblings().add(0, MutableText.of(new LiteralTextContent(replaceFormat.replaceAll("%TIME%", time.format(format)))).fillStyle(style));
5462
}
5563

5664
int width = 0;
@@ -66,7 +74,7 @@ public boolean process(FluidText text, @Nullable FluidText unfiltered) {
6674
.width(width)
6775
.creationTick(MinecraftClient.getInstance().inGameHud.getTicks())
6876
.time(time)
69-
.backgroundColor(backcolor)
77+
.backgroundColor(new Color(0, 0, 0, 100))
7078
.build();
7179
if (ChatHistory.getInstance().add(line)) {
7280
sendToHud(line.getDisplayText());

‎src/main/java/io/github/darkkronicle/advancedchatcore/chat/MessageDispatcher.java

+16-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021 DarkKronicle
2+
* Copyright (C) 2021-2022 DarkKronicle
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,18 +10,21 @@
1010
import io.github.darkkronicle.advancedchatcore.interfaces.IMessageFilter;
1111
import io.github.darkkronicle.advancedchatcore.interfaces.IMessageProcessor;
1212
import io.github.darkkronicle.advancedchatcore.util.FindType;
13-
import io.github.darkkronicle.advancedchatcore.util.FluidText;
1413
import io.github.darkkronicle.advancedchatcore.util.SearchResult;
1514
import io.github.darkkronicle.advancedchatcore.util.SearchUtils;
15+
import io.github.darkkronicle.advancedchatcore.util.StringInsert;
1616
import io.github.darkkronicle.advancedchatcore.util.StringMatch;
1717
import io.github.darkkronicle.advancedchatcore.util.StyleFormatter;
18+
import io.github.darkkronicle.advancedchatcore.util.TextUtil;
1819
import java.util.ArrayList;
1920
import java.util.HashMap;
2021
import java.util.Map;
2122
import java.util.Optional;
2223
import net.fabricmc.api.EnvType;
2324
import net.fabricmc.api.Environment;
2425
import net.minecraft.text.ClickEvent;
26+
import net.minecraft.text.LiteralTextContent;
27+
import net.minecraft.text.MutableText;
2528
import net.minecraft.text.Text;
2629
import org.apache.logging.log4j.LogManager;
2730

@@ -60,7 +63,7 @@ private MessageDispatcher() {
6063
if (search.size() == 0) {
6164
return Optional.empty();
6265
}
63-
Map<StringMatch, FluidText.StringInsert> insert = new HashMap<>();
66+
Map<StringMatch, StringInsert> insert = new HashMap<>();
6467
for (StringMatch match : search.getMatches()) {
6568
insert.put(
6669
match,
@@ -71,16 +74,12 @@ private MessageDispatcher() {
7174
url = "https://" + url;
7275
}
7376
if (current.getStyle().getClickEvent() == null) {
74-
return new FluidText(
75-
current.withStyle(current.getStyle().withClickEvent(
76-
new ClickEvent(ClickEvent.Action.OPEN_URL, url)
77-
)).withMessage(match1.match)
78-
);
77+
return MutableText.of(new LiteralTextContent(match1.match)).fillStyle(current.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, url)));
7978
}
80-
return new FluidText(current);
79+
return MutableText.of(current.getContent()).fillStyle(current.getStyle());
8180
});
8281
}
83-
text.replaceStrings(insert);
82+
TextUtil.replaceStrings(text, insert);
8483
return Optional.of(text);
8584
},
8685
-1);
@@ -108,27 +107,26 @@ private MessageDispatcher() {
108107
* @param text Text that is received
109108
*/
110109
public void handleText(Text text) {
111-
FluidText fluidText = new FluidText(text);
112-
boolean previouslyBlank = fluidText.getString().length() == 0;
113-
fluidText = preFilter(fluidText);
114-
if (fluidText.getString().length() == 0 && !previouslyBlank) {
110+
boolean previouslyBlank = text.getString().length() == 0;
111+
text = preFilter(text);
112+
if (text.getString().length() == 0 && !previouslyBlank) {
115113
// No more
116114
return;
117115
}
118-
process(fluidText);
116+
process(text);
119117
}
120118

121-
private FluidText preFilter(FluidText text) {
119+
private Text preFilter(Text text) {
122120
for (IMessageFilter f : preFilters) {
123-
Optional<FluidText> t = f.filter(text);
121+
Optional<Text> t = f.filter(text);
124122
if (t.isPresent()) {
125123
text = t.get();
126124
}
127125
}
128126
return text;
129127
}
130128

131-
private void process(FluidText text) {
129+
private void process(Text text) {
132130
for (IMessageFilter f : processors) {
133131
f.filter(text);
134132
}

‎src/main/java/io/github/darkkronicle/advancedchatcore/config/CommandsHandler.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
import io.github.darkkronicle.kommandlib.util.CommandUtil;
2929
import io.github.darkkronicle.kommandlib.util.InfoUtil;
3030
import net.minecraft.server.command.ServerCommandSource;
31-
import net.minecraft.text.Style;
31+
import net.minecraft.text.LiteralTextContent;
32+
import net.minecraft.text.MutableText;
33+
import net.minecraft.text.Text;
3234
import net.minecraft.util.Formatting;
3335

3436
import java.util.List;
@@ -167,7 +169,7 @@ public void setup() {
167169
if (value.isPresent()) {
168170
String val = value.get();
169171
val = val.replace('&', '§');
170-
FluidText text = StyleFormatter.formatText(new FluidText(new RawText(val, Style.EMPTY)));
172+
Text text = StyleFormatter.formatText(MutableText.of(new LiteralTextContent(val)));
171173
Optional<List<StringMatch>> matches = SearchUtils.findMatches(text, TEST_REGEX, FindType.REGEX);
172174
InfoUtil.sendChatMessage(text);
173175
if (matches.isEmpty()) {

0 commit comments

Comments
 (0)