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

[PORT] Port up, for yet more code breakage..... 😠

Browse Source
This commit is contained in:
HypherionSA
2025-05-06 18:48:04 +02:00
parent 8bb17f3c4c
commit 062b3a642a
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.jenkins/Jenkinsfile.snapshot
View File

@@ -3,7 +3,7 @@ def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae59
def JDK = "21"; def JDK = "21";
def majorMc = "1.21.6"; def majorMc = "1.21.6";
def modLoaders = "neoforge|fabric|quilt|paper"; def modLoaders = "neoforge|fabric|quilt|paper";
def supportedMc = "25w17a"; def supportedMc = "25w19a";
def reltype = "experimental"; def reltype = "experimental";
pipeline { pipeline {

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

@@ -1,8 +1,11 @@
package com.hypherionmc.craterlib.utils; 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.CommonPlatform;
import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
import com.mojang.serialization.JsonOps;
import lombok.Getter; import lombok.Getter;
import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer;
import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer;
@@ -19,7 +22,9 @@ import net.minecraft.client.Minecraft;
import net.minecraft.core.HolderLookup; import net.minecraft.core.HolderLookup;
import net.minecraft.core.RegistryAccess; import net.minecraft.core.RegistryAccess;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.ComponentSerialization;
import net.minecraft.network.chat.Style; import net.minecraft.network.chat.Style;
import net.minecraft.util.StrictJsonParser;
public class ChatUtils { public class ChatUtils {
@@ -31,14 +36,22 @@ public class ChatUtils {
private static final MiniMessage miniMessage = MiniMessage.miniMessage(); private static final MiniMessage miniMessage = MiniMessage.miniMessage();
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 JsonElement serialised = adventureSerializer.serializeToTree(inComponent);
return Component.Serializer.fromJson(serialised, getRegistryLookup());
// FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT
return ComponentSerialization.CODEC
.parse(getRegistryLookup().createSerializationContext(JsonOps.INSTANCE), serialised)
.getOrThrow(JsonParseException::new);
} }
public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) { public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) {
try { try {
final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup()); // FUCK YOU MOJANG. SERIOUSLY. FUCK OFF WITH THIS SHIT
return adventureSerializer.deserialize(serialised); final JsonElement serialised = ComponentSerialization.CODEC
.encodeStart(JsonOps.INSTANCE, inComponent)
.getOrThrow(JsonParseException::new);
return adventureSerializer.deserializeFromTree(serialised);
} catch (Exception e) { } catch (Exception e) {
return net.kyori.adventure.text.Component.text(inComponent.getString()); return net.kyori.adventure.text.Component.text(inComponent.getString());
} }

2
Fabric/src/main/java/com/hypherionmc/craterlib/network/CraterFabricNetworkHandler.java
View File

@@ -38,7 +38,7 @@ public class CraterFabricNetworkHandler extends PacketRegistry {
} }
ServerPlayNetworking.registerGlobalReceiver(holder.getType(), ServerPlayNetworking.registerGlobalReceiver(holder.getType(),
(ServerPlayNetworking.PlayPayloadHandler<CommonPacketWrapper<T>>) (payload, context) -> context.player().server.execute(() -> (ServerPlayNetworking.PlayPayloadHandler<CommonPacketWrapper<T>>) (payload, context) -> context.player().getServer().execute(() ->
holder.handler().accept( holder.handler().accept(
new PacketContext<>(BridgedPlayer.of(context.player()), payload.packet(), side)))); new PacketContext<>(BridgedPlayer.of(context.player()), payload.packet(), side))));
} }

2
gradle.properties
View File

@@ -10,7 +10,7 @@ mod_id=craterlib
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
minecraft_version=25w17a minecraft_version=25w19a
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
# Fabric # Fabric