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

[FEAT/BUG] Adventure parser backport and added Compat API for Advanced Chat

Browse Source
This commit is contained in:
HypherionSA
2025-04-28 15:10:18 +02:00
parent 799a0fecc7
commit 7abf86dced
182 changed files with 1716 additions and 905 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedCommandSourceStack.java.patch
View File

@@ -1,11 +1,11 @@
--- a/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedCommandSourceStack.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedCommandSourceStack.java
@@ -14,7 +14,7 @@
private final CommandSourceStack internal;
public void sendSuccess(Supplier<Component> supplier, boolean bl) {
- internal.sendSuccess(() -> ChatUtils.adventureToMojang(supplier.get()), bl);
+ internal.sendSuccess(ChatUtils.adventureToMojang(supplier.get()), bl);
@@ -19,7 +19,7 @@
if (!internal.getServer().getGameRules().getBoolean(RULE_SENDCOMMANDFEEDBACK)) {
internal.sendSystemMessage(ChatUtils.adventureToMojang(supplier.get()));
} else {
- internal.sendSuccess(() -> ChatUtils.adventureToMojang(supplier.get()), bl);
+ internal.sendSuccess(ChatUtils.adventureToMojang(supplier.get()), bl);
}
}
public void sendFailure(Component text) {

10
patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch
View File

@@ -8,7 +8,7 @@
import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
import lombok.Getter;
@@ -10,46 +10,29 @@
@@ -10,50 +10,33 @@
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
import net.kyori.adventure.text.serializer.json.JSONOptions;
@@ -42,9 +42,13 @@
}
public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) {
- final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup());
try {
- final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup());
+ 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());
}
- }
-
- private static HolderLookup.Provider getRegistryLookup() {

2
patches/1.19.3/Fabric/build.gradle.patch
View File

@@ -8,7 +8,7 @@
modImplementation("me.shedaniel.cloth:cloth-config-fabric:${cloth_config}")
modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
modImplementation "maven.modrinth:vanish:${vanish}"
@@ -117,8 +116,8 @@
@@ -118,8 +117,8 @@
setVersionType("release")
setChangelog(rootProject.file("changelog.md"))
setProjectVersion("${minecraft_version}-${project.version}")

3
patches/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
View File

@@ -1,11 +1,12 @@
--- a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
+++ b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
@@ -1,15 +1,20 @@
@@ -1,15 +1,21 @@
package com.hypherionmc.craterlib.common;
import com.hypherionmc.craterlib.core.platform.CompatUtils;
+import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import net.kyori.adventure.text.Component;
import team.creative.playerrevive.api.IBleeding;
import team.creative.playerrevive.server.PlayerReviveServer;
+import redstonedubstep.mods.vanishmod.VanishUtil;

12
patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java.patch
View File

@@ -1,6 +1,6 @@
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java
+++ /dev/null
@@ -1,50 +1,0 @@
@@ -1,60 +1,0 @@
-package com.hypherionmc.craterlib.common;
-
-import com.hypherionmc.craterlib.core.platform.CompatUtils;
@@ -50,4 +50,14 @@
- IBleeding bleeding = PlayerReviveServer.getBleeding(player.toMojangServerPlayer());
- return bleeding != null && bleeding.revived();
- }
-
- @Override
- public boolean isPrivateMessage(BridgedPlayer player) {
- return false;
- }
-
- @Override
- public Component getChannelPrefix(BridgedPlayer player) {
- return Component.empty();
- }
-}

10
patches/1.19.3/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java.patch Normal file
View File

@@ -0,0 +1,10 @@
--- a/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java
+++ b/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java
@@ -4,6 +4,7 @@
import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
import com.hypherionmc.craterlib.utils.ChatUtils;
+import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.metadata.MetadataValue;

4
patches/1.19.3/gradle.properties.patch
View File

@@ -23,7 +23,7 @@
# Dependencies
moon_config=1.0.12
@@ -29,23 +26,22 @@
@@ -29,24 +26,23 @@
adventure=4.17.0
rpc_sdk=1.0
discord_formatter=2.0.0
@@ -40,6 +40,8 @@
-ftb_ranks=2101.1.1
-player_revive=6119534
-creative_core=6113754
-advanced_chat=SNA4dye5
+advanced_chat=RN7kRIrY
+player_revive=4353422
+creative_core=4407520
+ftb_ranks=1904.1.1-build.82