From 2d0504fec60f9b6b039f1db574dd20aea1d78363 Mon Sep 17 00:00:00 2001 From: Aria Date: Sat, 22 Apr 2023 04:51:02 -0700 Subject: [PATCH] Alter return types of ChatHelpers to be MutableComponent --- gradle.properties | 4 ++-- .../dev/zontreck/libzontreck/util/ChatHelpers.java | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index 757bf2b..fe9a323 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,8 +5,8 @@ org.gradle.daemon=false mc_version=1.19.4 forge_version=45.0.46 -myversion=1.0.7.0422230411 -parchment_version=2023.03.12 +myversion=1.0.7.0422230450 +# parchment_version=2023.03.12 # luckperms_api_version=5.4 libac=1.1.3 diff --git a/src/main/java/dev/zontreck/libzontreck/util/ChatHelpers.java b/src/main/java/dev/zontreck/libzontreck/util/ChatHelpers.java index a06d482..e914a4c 100644 --- a/src/main/java/dev/zontreck/libzontreck/util/ChatHelpers.java +++ b/src/main/java/dev/zontreck/libzontreck/util/ChatHelpers.java @@ -80,7 +80,7 @@ public class ChatHelpers { * @param inputs Entries to replace with in input * @return */ - public static Component macro(String input, String... inputs) + public static MutableComponent macro(String input, String... inputs) { return Component.literal(macroize(input,inputs)); } @@ -108,10 +108,9 @@ public class ChatHelpers { * @param ce Click event to add to the component * @return Component + Merged Event */ - public static Component applyClickEvent(Component comp, ClickEvent ce) + public static MutableComponent applyClickEvent(MutableComponent comp, ClickEvent ce) { - MutableComponent mc = MutableComponent.create(comp.getContents()); - return ComponentUtils.mergeStyles(mc, comp.getStyle().withClickEvent(ce)); + return comp.setStyle(comp.getStyle().withClickEvent(ce)); } /** @@ -120,9 +119,8 @@ public class ChatHelpers { * @param ce Hover event to add to the component * @return Component + Merged Event */ - public static Component applyHoverEvent(Component comp, HoverEvent ce) + public static MutableComponent applyHoverEvent(MutableComponent comp, HoverEvent ce) { - MutableComponent mc = MutableComponent.create(comp.getContents()); - return ComponentUtils.mergeStyles(mc, comp.getStyle().withHoverEvent(ce)); + return comp.setStyle(comp.getStyle().withHoverEvent(ce)); } }