Merge remote-tracking branch 'origin/feature/renderer' into feature/renderer

Author: bladekt

common/src/main/java/com/lambda/mixin/render/ChatScreenMixin.java

@@ -1,9 +1,12 @@
 package com.lambda.mixin.render;
 
+import com.lambda.Lambda;
 import com.lambda.command.CommandManager;
 import com.lambda.graphics.renderer.gui.font.FontRenderer;
 import com.lambda.graphics.renderer.gui.font.LambdaEmoji;
 import com.lambda.graphics.renderer.gui.font.glyph.GlyphInfo;
+import com.lambda.module.modules.client.LambdaMoji;
+import com.lambda.util.math.Vec2d;
 import kotlin.Pair;
 import kotlin.ranges.IntRange;
 import net.minecraft.client.gui.screen.ChatScreen;
@@ -13,16 +16,22 @@
 import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 @Mixin(ChatScreen.class)
 public abstract class ChatScreenMixin {
     @ModifyArg(method = "sendMessage", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayNetworkHandler;sendChatMessage(Ljava/lang/String;)V"), index = 0)
     private String modifyChatText(String chatText) {
+        if (LambdaMoji.INSTANCE.isDisabled()) return chatText;
+
         List<Pair<GlyphInfo, IntRange>> emojis = FontRenderer.Companion.parseEmojis(chatText, LambdaEmoji.Twemoji);
         Collections.reverse(emojis);
 
+        List<String> pushEmojis = new ArrayList<>();
+        List<Vec2d> pushPositions = new ArrayList<>();
+
         for (Pair<GlyphInfo, IntRange> emoji : emojis) {
             String emojiString = chatText.substring(emoji.getSecond().getStart() + 1, emoji.getSecond().getEndInclusive());
             if (LambdaEmoji.Twemoji.get(emojiString) == null)
@@ -33,10 +42,20 @@ private String modifyChatText(String chatText) {
             // and render it after the text
             chatText = chatText.substring(0, emoji.getSecond().getStart()) + " " + chatText.substring(emoji.getSecond().getEndInclusive() + 1);
 
-            // TODO: Build a renderer for the emojis
-            // TODO: Render the emojis at their correct position
+            // We cannot retain the position in the future, but we can
+            // assume that every time you send a message the height of
+            // the position will change by the height of the glyph
+            // The positions are from the top left corner of the screen
+            int x = Lambda.getMc().textRenderer.getWidth(chatText.substring(0, emoji.getSecond().getStart()));
+            int y = Lambda.getMc().textRenderer.fontHeight;
+
+            pushEmojis.add(String.format(":%s:", emojiString));
+            pushPositions.add(new Vec2d(x, y));
         }
 
+        // Not optimal because it has to parse the emoji again but who cares
+        LambdaMoji.INSTANCE.add(pushEmojis, pushPositions);
+
         return chatText;
     }
 

common/src/main/kotlin/com/lambda/graphics/renderer/gui/font/FontRenderer.kt

@@ -56,7 +56,7 @@ class FontRenderer(
      * The values are hardcoded
      * We do not need to ask the emoji font since the height is smaller
      */
-    private fun getHeight(scale: Double = 1.0) = font.glyphs.fontHeight * getScaleFactor(scale) * 0.7
+    fun getHeight(scale: Double = 1.0) = font.glyphs.fontHeight * getScaleFactor(scale) * 0.7
 
     /**
      * Iterates over each character and emoji in the text.

common/src/main/kotlin/com/lambda/module/modules/client/LambdaMoji.kt

@@ -1,11 +1,48 @@
 package com.lambda.module.modules.client
 
+import com.lambda.event.events.RenderEvent
+import com.lambda.event.events.TickEvent
+import com.lambda.event.listener.SafeListener.Companion.listener
+import com.lambda.gui.api.RenderLayer
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
+import com.lambda.util.math.Vec2d
 
 object LambdaMoji : Module(
     name = "LambdaMoji",
     description = "",
     defaultTags = setOf(ModuleTag.CLIENT, ModuleTag.RENDER),
     enabledByDefault = true,
-)
+) {
+    private val scale by setting("Emoji Scale", 1.0, 0.5..2.0, 0.1)
+
+    private val renderer = RenderLayer()
+    private val renderQueue = hashMapOf<List<String>, List<Vec2d>>()
+
+    init {
+        listener<TickEvent.Pre> {
+            var index = 0
+            renderQueue.forEach { (emojis, positions) ->
+                emojis.forEachIndexed { emojiIndex, emoji ->
+                    val pos = positions[emojiIndex]
+
+                    renderer.font.build(
+                        text = emoji,
+                        position = Vec2d(pos.x, pos.y * (index.toDouble() + 1)),
+                        scale = scale,
+                    )
+                }
+
+                index++
+            }
+        }
+
+        listener<RenderEvent.GUI.Fixed> {
+            renderer.render()
+        }
+    }
+
+    fun add(emojis: List<String>, positions: List<Vec2d>) {
+        renderQueue[emojis] = positions
+    }
+}