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

[CHORE] Update porting patches

Browse Source
This commit is contained in:
HypherionSA
2024-07-05 20:32:53 +02:00
parent 7cb010183f
commit ce6ee95256
28 changed files with 364 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java.patch
View File

@@ -1,11 +0,0 @@
--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/resources/ResourceIdentifier.java
@@ -11,7 +11,7 @@
}
public ResourceIdentifier(String path) {
- this.internal = ResourceLocation.withDefaultNamespace(path);
+ this.internal = ResourceLocation.parse(path);
}
public String getNamespace() {

46
patches/1.21/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch
View File

@@ -1,46 +0,0 @@
--- a/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
@@ -1,5 +1,7 @@
package com.hypherionmc.craterlib.utils;
+import com.hypherionmc.craterlib.core.platform.CommonPlatform;
+import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer;
import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer;
@@ -9,7 +11,10 @@
import net.minecraft.ChatFormatting;
import net.minecraft.SharedConstants;
import net.minecraft.Util;
+import net.minecraft.client.Minecraft;
+import net.minecraft.core.HolderLookup;
import net.minecraft.core.RegistryAccess;
+import net.minecraft.data.registries.VanillaRegistries;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.Style;
@@ -23,12 +28,22 @@
public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) {
final String serialised = adventureSerializer.serialize(inComponent);
- return Component.Serializer.fromJson(serialised, RegistryAccess.EMPTY);
+ return Component.Serializer.fromJson(serialised, getRegistryLookup());
}
public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) {
- final String serialised = Component.Serializer.toJson(inComponent, RegistryAccess.EMPTY);
+ final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup());
return adventureSerializer.deserialize(serialised);
+ }
+
+ private static HolderLookup.Provider getRegistryLookup() {
+ if (ModloaderEnvironment.INSTANCE.getEnvironment().isClient() && Minecraft.getInstance().level != null)
+ return Minecraft.getInstance().level.registryAccess();
+
+ if (ModloaderEnvironment.INSTANCE.getEnvironment().isServer() && CommonPlatform.INSTANCE.getMCServer() != null)
+ return CommonPlatform.INSTANCE.getMCServer().toMojang().registryAccess();
+
+ return RegistryAccess.EMPTY;
}
// Some text components contain duplicate text, resulting in duplicate messages