🐛 Fix emote processing and adjust custom image scale factor

Author: fantomitechno

src/main/java/dev/renoux/emotes/mixins/TranslatableContentsMixin.java

@@ -23,6 +23,7 @@
  */
 package dev.renoux.emotes.mixins;
 
+import dev.renoux.emotes.utils.EmoteProcessor;
 import dev.renoux.emotes.utils.EmoteUtil;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.api.FabricLoader;
@@ -39,9 +40,6 @@
 
 import java.util.Optional;
 
-import static dev.renoux.emotes.Emotes.LOGGER;
-import static dev.renoux.emotes.Emotes.metadata;
-
 @Mixin(TranslatableContents.class)
 public abstract class TranslatableContentsMixin {
     @Shadow public abstract String getKey();
@@ -56,9 +54,9 @@ private String getOrDefault(Language instance, String key, String fallback) {
 
     @Redirect(method = "visit(Lnet/minecraft/network/chat/FormattedText$StyledContentConsumer;Lnet/minecraft/network/chat/Style;)Ljava/util/Optional;", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/chat/FormattedText;visit(Lnet/minecraft/network/chat/FormattedText$StyledContentConsumer;Lnet/minecraft/network/chat/Style;)Ljava/util/Optional;"))
     private <T> Optional<T> visit(FormattedText instance, FormattedText.StyledContentConsumer<T> tStyledContentConsumer, Style style) {
-        if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
-            if (this.getKey().startsWith("emotes.")) {
-                String[] splitEmote = instance.getString().split(":");
+        if (this.getKey().startsWith("emotes.")) {
+            String[] splitEmote = instance.getString().split(":");
+            if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
                 Integer codepoint = EmoteUtil.getInstance().getCodepoint(splitEmote[0].replace("emotes.", ""));
                 if (codepoint == null) {
                     // Fix from @Juloos
@@ -67,6 +65,8 @@ private <T> Optional<T> visit(FormattedText instance, FormattedText.StyledConten
                 String emote = Character.toString(codepoint);
                 FormattedText newInstance = FormattedText.of(emote);
                 return newInstance.visit(tStyledContentConsumer, style.withFont(EmoteUtil.CUSTOM_IMAGE_FONT_IDENTIFIER).withHoverEvent(new HoverEvent.ShowText(Component.literal(splitEmote[1]))));
+            } else {
+                return FormattedText.of(splitEmote[splitEmote.length - 1]).visit(tStyledContentConsumer, style);
             }
         }
         return instance.visit(tStyledContentConsumer, style);

src/main/java/dev/renoux/emotes/utils/CustomImageFont.java

@@ -70,6 +70,11 @@ public float getAdvance() {
       return this.advance;
     }
 
+    @Override
+    public float getShadowOffset() {
+      return 0.0f;
+    }
+
     @Override
     public @NotNull BakedGlyph bake(Function<SheetGlyphInfo, BakedGlyph> function) {
       return function.apply(new CustomImageRenderableGlyph() {

src/main/java/dev/renoux/emotes/utils/EmoteProcessor.java

@@ -34,14 +34,14 @@
 
 public class EmoteProcessor {
 
-    private static Map<String, String> EMOTES = new HashMap<>();
+    public static Map<String, String> EMOTES = new HashMap<>();
 
     public static void init() {
         EMOTES = new HashMap<>();
         ValueList<String> emotes = Emotes.serverConfig.emotes.getRealValue();
         for (String emote : emotes) {
             String[] splitedEmote = emote.split(":");
-            if (splitedEmote[0] == "nul_") {
+            if (splitedEmote[0].equals("nul_")) {
                 EMOTES.put("nul", splitedEmote[1]);
             } else {
                 EMOTES.put(splitedEmote[0], splitedEmote[1]);

src/main/java/dev/renoux/emotes/utils/EmoteUtil.java

@@ -39,7 +39,7 @@ public class EmoteUtil {
     public static final ResourceLocation CUSTOM_IMAGE_FONT_IDENTIFIER = ResourceLocation.fromNamespaceAndPath(metadata.getId(), "emote_font");
 
     // I've found this is a pretty good scale factor for 24x24px Twitch emotes.
-    public static final float CUSTOM_IMAGE_SCALE_FACTOR = 0.08f;
+    public static final float CUSTOM_IMAGE_SCALE_FACTOR = 0.07f;
 
     private final CustomImageFont customImageFont;
     private final CustomImageFontStorage customImageFontStorage;