From bebc65e425612af4d8bc43d0e807f1cfbfbcebc7 Mon Sep 17 00:00:00 2001 From: Igor Michalski Date: Sat, 23 Mar 2024 21:56:18 +0100 Subject: [PATCH] GH-742 Remove center tag (#743) Took 54 minutes --- eternalcore-core/build.gradle.kts | 7 ------ .../core/bridge/adventure/AdventureSetup.java | 2 -- .../adventure/resolver/CenterTagResolver.java | 24 ------------------- 3 files changed, 33 deletions(-) delete mode 100644 eternalcore-core/src/main/java/com/eternalcode/core/bridge/adventure/resolver/CenterTagResolver.java diff --git a/eternalcore-core/build.gradle.kts b/eternalcore-core/build.gradle.kts index 8dc2e9ef9..6c3be5a4a 100644 --- a/eternalcore-core/build.gradle.kts +++ b/eternalcore-core/build.gradle.kts @@ -93,11 +93,4 @@ eternalShadow { // metrics library("org.bstats:bstats-bukkit:${Versions.BSTATS}") libraryRelocate("org.bstats") - - // pixel-width - library("solar.squares:pixel-width-core:${Versions.PIXEL_WIDTH}") - library("solar.squares:pixel-width-utils:${Versions.PIXEL_WIDTH}") - libraryRelocate( - "solar.squares", - ) } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/bridge/adventure/AdventureSetup.java b/eternalcore-core/src/main/java/com/eternalcode/core/bridge/adventure/AdventureSetup.java index ac1b84506..d7c7b0d7a 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/bridge/adventure/AdventureSetup.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/bridge/adventure/AdventureSetup.java @@ -2,7 +2,6 @@ import com.eternalcode.commons.adventure.AdventureLegacyColorPostProcessor; import com.eternalcode.commons.adventure.AdventureLegacyColorPreProcessor; -import com.eternalcode.core.bridge.adventure.resolver.CenterTagResolver; import com.eternalcode.core.injector.annotations.Bean; import com.eternalcode.core.injector.annotations.component.BeanSetup; import net.kyori.adventure.platform.AudienceProvider; @@ -23,7 +22,6 @@ MiniMessage miniMessage() { return MiniMessage.builder() .postProcessor(new AdventureLegacyColorPostProcessor()) .preProcessor(new AdventureLegacyColorPreProcessor()) - .editTags(builder -> builder.resolver(CenterTagResolver.RESOLVER)) .build(); } diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/bridge/adventure/resolver/CenterTagResolver.java b/eternalcore-core/src/main/java/com/eternalcode/core/bridge/adventure/resolver/CenterTagResolver.java deleted file mode 100644 index 1d9c6c740..000000000 --- a/eternalcore-core/src/main/java/com/eternalcode/core/bridge/adventure/resolver/CenterTagResolver.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.eternalcode.core.bridge.adventure.resolver; - -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.TextComponent; -import net.kyori.adventure.text.minimessage.tag.Modifying; -import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; -import org.jetbrains.annotations.NotNull; -import solar.squares.pixelwidth.utils.CenterAPI; - -public class CenterTagResolver implements Modifying { - - public static final String TAG_NAME = "center"; - - public static final TagResolver RESOLVER = TagResolver.resolver(TAG_NAME, new CenterTagResolver()); - - @Override - public Component apply(@NotNull Component current, int depth) { - if (current instanceof TextComponent component && !component.content().isBlank()) { - return CenterAPI.center(component); - } - - return Component.empty().mergeStyle(current); - } -}