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

Rebuild porting patches

Browse Source
This commit is contained in:
HypherionSA
2025-06-17 19:18:23 +02:00
parent 7abf86dced
commit 34dc478e2e
99 changed files with 725 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,18 @@
--- a/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
@@ -1,7 +1,5 @@
@@ -1,11 +1,6 @@
package com.hypherionmc.craterlib.utils;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import com.hypherionmc.craterlib.core.platform.CommonPlatform;
-import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
-import com.mojang.serialization.JsonOps;
import lombok.Getter;
import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer;
@@ -13,55 +11,40 @@
import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer;
@@ -16,65 +11,40 @@
import net.minecraft.ChatFormatting;
import net.minecraft.SharedConstants;
import net.minecraft.Util;
@@ -18,7 +22,9 @@
-import net.minecraft.core.HolderLookup;
-import net.minecraft.core.RegistryAccess;
import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.ComponentSerialization;
import net.minecraft.network.chat.Style;
-import net.minecraft.util.StrictJsonParser;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.TranslatableComponent;
@@ -33,16 +39,26 @@
private static final MiniMessage miniMessage = MiniMessage.miniMessage();
public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) {
final String serialised = adventureSerializer.serialize(inComponent);
- return Component.Serializer.fromJson(serialised, getRegistryLookup());
- final JsonElement serialised = adventureSerializer.serializeToTree(inComponent);
-
- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT
- return ComponentSerialization.CODEC
- .parse(getRegistryLookup().createSerializationContext(JsonOps.INSTANCE), serialised)
- .getOrThrow(JsonParseException::new);
+ final String serialised = adventureSerializer.serialize(inComponent);
+ return Component.Serializer.fromJson(serialised);
}
public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) {
try {
- final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup());
- // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT
- final JsonElement serialised = ComponentSerialization.CODEC
- .encodeStart(JsonOps.INSTANCE, inComponent)
- .getOrThrow(JsonParseException::new);
-
- return adventureSerializer.deserializeFromTree(serialised);
+ final String serialised = Component.Serializer.toJson(inComponent);
return adventureSerializer.deserialize(serialised);
+ return adventureSerializer.deserialize(serialised);
} catch (Exception e) {
return net.kyori.adventure.text.Component.text(inComponent.getString());
}
@@ -70,7 +86,7 @@
}
public static String strip(String inString, String... toStrip) {
@@ -90,7 +73,7 @@
@@ -103,7 +73,7 @@
}
public static net.kyori.adventure.text.Component resolve(String component, boolean formatted) {
@@ -79,7 +95,7 @@
if (formatted) {
returnVal = MinecraftSerializer.INSTANCE.serialize(component);
}
@@ -118,7 +101,7 @@
@@ -131,7 +101,7 @@
if (identifier == null)
return net.kyori.adventure.text.Component.text("Unknown");