firstdarkdev/CraterLib
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

[BUG] Fix 1.18.2 compile error

Browse Source
This commit is contained in:
HypherionSA
2024-11-19 19:33:20 +02:00
parent e0e37685e2
commit bd73d19674
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
View File

@@ -9,6 +9,7 @@ import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
import net.kyori.adventure.text.serializer.json.JSONOptions; import net.kyori.adventure.text.serializer.json.JSONOptions;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.SharedConstants; import net.minecraft.SharedConstants;
import net.minecraft.Util;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.Style; import net.minecraft.network.chat.Style;
import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TextComponent;

2
commit.sha
View File

@@ -1 +1 @@
0a7d569db49dd69e378de08da7c815993f91c523 cc26cd450d2ed828eeb7d937a8b5eb92e97afef9

11
patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch
View File

@@ -8,11 +8,10 @@
import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer;
import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer;
@@ -11,14 +9,10 @@ @@ -12,13 +10,10 @@
import net.kyori.adventure.text.serializer.json.JSONOptions;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.SharedConstants; import net.minecraft.SharedConstants;
-import net.minecraft.Util; import net.minecraft.Util;
-// @noplugin -// @noplugin
-import net.minecraft.client.Minecraft; -import net.minecraft.client.Minecraft;
-// #noplugin -// #noplugin
@@ -25,7 +24,7 @@
public class ChatUtils { public class ChatUtils {
@@ -30,32 +24,20 @@ @@ -30,32 +25,20 @@
public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) {
final String serialised = adventureSerializer.serialize(inComponent); final String serialised = adventureSerializer.serialize(inComponent);
@@ -61,7 +60,7 @@
} }
public static String strip(String inString, String... toStrip) { public static String strip(String inString, String... toStrip) {
@@ -84,7 +66,7 @@ @@ -84,7 +67,7 @@
} }
public static net.kyori.adventure.text.Component resolve(String component, boolean formatted) { public static net.kyori.adventure.text.Component resolve(String component, boolean formatted) {
@@ -70,7 +69,7 @@
if (formatted) { if (formatted) {
returnVal = MinecraftSerializer.INSTANCE.serialize(component); returnVal = MinecraftSerializer.INSTANCE.serialize(component);
} }
@@ -112,7 +94,7 @@ @@ -112,7 +95,7 @@
if (identifier == null) if (identifier == null)
return net.kyori.adventure.text.Component.text("Unknown"); return net.kyori.adventure.text.Component.text("Unknown");