1.19.1 port. (Fix #167)

Author: juancarloscp52

gradle.properties

@@ -1,17 +1,17 @@
 org.gradle.jvmargs=-Xmx2048m
 # Fabric Properties
 	# check these on https://fabricmc.net/develop/
-	minecraft_version=1.19
-	yarn_mappings=1.19+build.2
-	loader_version=0.14.7
+	minecraft_version=1.19.1
+	yarn_mappings=1.19.1+build.1
+	loader_version=0.14.8
 
 # Mod Properties
 	mod_version = 1.4.2
 	maven_group = me.juancarloscp52
 	archives_base_name = bedrockify
 
 # Dependencies
-	fabric_version=0.55.3+1.19
-  	modmenu_version=4.0.0
-	cloth_config_version=7.0.72
+	fabric_version=0.58.5+1.19.1
+  	modmenu_version=4.0.5
+	cloth_config_version=7.0.73
 	apple_skin=mc1.19-2.4.0

src/main/java/me/juancarloscp52/bedrockify/mixin/client/features/chat/ChatHudMixin.java

@@ -7,6 +7,8 @@
 import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.gui.hud.ChatHud;
 import net.minecraft.client.gui.hud.ChatHudLine;
+import net.minecraft.client.gui.hud.MessageIndicator;
+import net.minecraft.client.network.message.MessageHandler;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.Style;
@@ -26,8 +28,8 @@
 @Mixin(ChatHud.class)
 public abstract class ChatHudMixin extends DrawableHelper {
 
-    @Shadow protected abstract void processMessageQueue();
-    @Shadow @Final private List<ChatHudLine<OrderedText>> visibleMessages;
+    //@Shadow protected abstract void processMessageQueue();
+    @Shadow @Final private List<ChatHudLine.Visible> visibleMessages;
     @Shadow protected abstract boolean isChatFocused();
     @Shadow public abstract double getChatScale();
     @Shadow public abstract int getWidth();
@@ -36,12 +38,18 @@ public abstract class ChatHudMixin extends DrawableHelper {
     @Shadow private static double getMessageOpacityMultiplier(int age) {
         return 0;
     }
-    @Shadow @Final private Deque<Text> messageQueue;
+    //@Shadow @Final private Deque<Text> messageQueue;
     @Shadow private boolean hasUnreadNewMessages;
     @Shadow public abstract int getVisibleLineCount();
     @Shadow protected abstract boolean isChatHidden();
     @Shadow public abstract void addMessage(Text message);
-    @Shadow private long lastMessageAddedTime;
+    //@Shadow private long lastMessageAddedTime;
+
+    @Shadow protected abstract int getLineHeight();
+
+    @Shadow protected abstract int getIndicatorX(ChatHudLine.Visible line);
+
+    @Shadow protected abstract void drawIndicatorIcon(MatrixStack matrices, int x, int y, MessageIndicator.Icon icon);
 
     private int counter1 =0;
     BedrockifySettings settings = Bedrockify.getInstance().settings;
@@ -55,7 +63,6 @@ private void render(MatrixStack matrixStack, int ticks, CallbackInfo info){
             return;
 
         if (!this.isChatHidden()) {
-            this.processMessageQueue();
             int visibleLines = Math.min(this.getVisibleLineCount(),this.getAvailableLines());
             int visibleMessagesCount = this.visibleMessages.size();
             if (visibleMessagesCount > 0) {
@@ -67,17 +74,19 @@ private void render(MatrixStack matrixStack, int ticks, CallbackInfo info){
                 matrixStack.push();
                 matrixStack.translate(safeArea, (float) (48-MinecraftClient.getInstance().getWindow().getScaledHeight() + (counter1*(9.0D * chatScale* (this.client.options.getChatLineSpacing().getValue() + 1.0D))))+ posY, 0.0F);
                 matrixStack.scale(chatScale, chatScale, 1.0F);
-                double textOpacity = this.client.options.getChtOpacity().getValue() * 0.9D + 0.1D;
+                double textOpacity = this.client.options.getChatOpacity().getValue() * 0.9D + 0.1D;
                 double backgroundOpacity = this.client.options.getTextBackgroundOpacity().getValue();
-                double chatLineSpacing1 = 9.0D * (this.client.options.getChatLineSpacing().getValue() + 1.0D);
+                //double chatLineSpacing1 = 9.0D * (this.client.options.getChatLineSpacing().getValue() + 1.0D);
+                double chatLineSpacing1 = this.getLineHeight();
+
                 double chatLineSpacing2 = -8.0D * (this.client.options.getChatLineSpacing().getValue() + 1.0D) + 4.0D * this.client.options.getChatLineSpacing().getValue();
                 counter1 = 0; //Shown messages
 
                 for(int i = 0; i + this.scrolledLines < this.visibleMessages.size() && i < visibleLines; ++i) {
-                    ChatHudLine<OrderedText> chatHudLine = this.visibleMessages.get(i + this.scrolledLines);
+                    ChatHudLine.Visible chatHudLine = this.visibleMessages.get(i + this.scrolledLines);
                     if (chatHudLine != null) {
                         int ticksSinceCreation;
-                        ticksSinceCreation = ticks - chatHudLine.getCreationTick();
+                        ticksSinceCreation = ticks - chatHudLine.addedTime();
                         if (ticksSinceCreation < 200 || isChatFocused) {
                             double opacityMultiplayer = isChatFocused ? 1.0D : getMessageOpacityMultiplier(ticksSinceCreation);
                             int finalTextOpacity = (int)(255.0D * opacityMultiplayer * textOpacity);
@@ -87,10 +96,23 @@ private void render(MatrixStack matrixStack, int ticks, CallbackInfo info){
                                 double currentMessageHeight = (double)(-i) * chatLineSpacing1;
                                 matrixStack.push();
                                 matrixStack.translate(0, 0, 0);
-                                fill(matrixStack, 0, (int)currentMessageHeight, scaledChatWidth + 4, (int)(currentMessageHeight - chatLineSpacing1), finalBackgroundOpacity << 24);
+                                ChatHud.fill(matrixStack, 0, (int)currentMessageHeight, scaledChatWidth + 6, (int)(currentMessageHeight - chatLineSpacing1), finalBackgroundOpacity << 24);
+
+                                // Message security indicator
+                                MessageIndicator messageIndicator = chatHudLine.indicator();
+                                if (messageIndicator != null) {
+                                    int indicatorColor = messageIndicator.indicatorColor() | finalTextOpacity << 24;
+                                    ChatHud.fill(matrixStack, 0, (int)currentMessageHeight, 2, (int)(currentMessageHeight - chatLineSpacing1), indicatorColor);
+                                    if (isChatFocused() && chatHudLine.endOfEntry() && messageIndicator.icon() != null) {
+                                        int w = this.getIndicatorX(chatHudLine);
+                                        int x = (int)currentMessageHeight + this.client.textRenderer.fontHeight;
+                                        this.drawIndicatorIcon(matrixStack, w, x, messageIndicator.icon());
+                                    }
+                                }
+
                                 RenderSystem.enableBlend();
                                 matrixStack.translate(0, 0, 0);
-                                this.client.textRenderer.drawWithShadow(matrixStack, chatHudLine.getText(), 2F, (float)((int)(currentMessageHeight + chatLineSpacing2)), 16777215 + (finalTextOpacity << 24));
+                                this.client.textRenderer.drawWithShadow(matrixStack, chatHudLine.content(), 4F, (float)((int)(currentMessageHeight + chatLineSpacing2)), 16777215 + (finalTextOpacity << 24));
                                 RenderSystem.disableBlend();
                                 matrixStack.pop();
                             }
@@ -99,21 +121,23 @@ private void render(MatrixStack matrixStack, int ticks, CallbackInfo info){
                 }
 
                 //Unread Messages:
-                if (!this.messageQueue.isEmpty()) {
+                long unprocessedMessageCount = this.client.getMessageHandler().getUnprocessedMessageCount();
+                if (unprocessedMessageCount>0) {
                     int textOpacityFinal = (int)(128.0D * textOpacity);
                     int backgroundOpacityFinal = (int)(255.0D * backgroundOpacity);
                     matrixStack.push();
                     matrixStack.translate(0.0D, 0.0D, 50.0D);
                     fill(matrixStack, -2, 0, scaledChatWidth + 4, 9, backgroundOpacityFinal << 24);
                     RenderSystem.enableBlend();
                     matrixStack.translate(0.0D, 0.0D, 50.0D);
-                    this.client.textRenderer.drawWithShadow(matrixStack, Text.translatable("chat.queue", this.messageQueue.size()), 2F, 1.0F, 16777215 + (textOpacityFinal << 24));
+                    this.client.textRenderer.drawWithShadow(matrixStack, Text.translatable("chat.queue", unprocessedMessageCount), 2F, 1.0F, 16777215 + (textOpacityFinal << 24));
                     matrixStack.pop();
                     RenderSystem.disableBlend();
                 }
 
                 if (isChatFocused) {
-                    int textSize = 9;
+                    //int textSize = 9;
+                    int textSize = this.getLineHeight();
                     int x = visibleMessagesCount * textSize + visibleMessagesCount;
                     int renderedMessages = counter1 * textSize + counter1;
                     int z = this.scrolledLines * renderedMessages / visibleMessagesCount;
@@ -139,16 +163,16 @@ private void render(MatrixStack matrixStack, int ticks, CallbackInfo info){
     public void mouseClicked(double x, double y, CallbackInfoReturnable<Boolean> info){
         if(!settings.isBedrockChatEnabled() || client.options.debugEnabled)
             return;
-        if(this.isChatFocused() && !this.client.options.hudHidden && !this.isChatHidden() && !this.messageQueue.isEmpty()){
+        MessageHandler messageHandler = this.client.getMessageHandler();
+        if(this.isChatFocused() && !this.client.options.hudHidden && !this.isChatHidden() && messageHandler.getUnprocessedMessageCount() != 0L){
             int safeArea = settings.overlayIgnoresSafeArea? 0: settings.getScreenSafeArea();
             int posY = 2+settings.getPositionHUDHeight() + (settings.getPositionHUDHeight()<50? 50:0) + (settings.isShowPositionHUDEnabled() ? 10 : 0) + (settings.getFPSHUDoption()==2 ? 10 : 0) + safeArea;
             double lineSize = 9.0D * (this.client.options.getChatLineSpacing().getValue() + 1.0D);
             double chatX= x - safeArea;
             double chatY = posY+(counter1*lineSize) - y;
 
             if(chatX<=MathHelper.floor(this.getWidth() / this.getChatScale()) && chatY < 0.0D && chatY > (double)MathHelper.floor(-9.0D * this.getChatScale())){
-                this.addMessage(this.messageQueue.remove());
-                this.lastMessageAddedTime = System.currentTimeMillis();
+                messageHandler.process();
                 info.setReturnValue(true);
             }else{
                 info.setReturnValue(false);
@@ -177,8 +201,8 @@ public void getText(double x, double y, CallbackInfoReturnable<Style> info){
                     if(chatY < 9*lines+lines){
                         int line = (int)(chatY/9.0D + this.scrolledLines);
                         if(line>=0 && line<this.visibleMessages.size()){
-                            ChatHudLine<OrderedText> chatHudLine = this.visibleMessages.get(line);
-                            info.setReturnValue(this.client.textRenderer.getTextHandler().getStyleAt(chatHudLine.getText(), (int)chatX));
+                            ChatHudLine.Visible chatHudLine = this.visibleMessages.get(line);
+                            info.setReturnValue(this.client.textRenderer.getTextHandler().getStyleAt(chatHudLine.content(), (int)chatX));
                             return;
                         }
                     }

src/main/java/me/juancarloscp52/bedrockify/mixin/client/features/loadingScreens/LevelLoadingScreenMixin.java

@@ -45,7 +45,7 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta, Ca
         long l = Util.getMeasuringTimeMs();
         if (l - this.lastNarrationTime > 2000L) {
             this.lastNarrationTime = l;
-            NarratorManager.INSTANCE.narrate((Text.translatable("narrator.loading", new Object[]{string})).getString());
+            this.narrateScreenIfNarrationEnabled(true);
         }
 
         if (Bedrockify.getInstance().settings.isShowChunkMapEnabled())

src/main/java/me/juancarloscp52/bedrockify/mixin/client/features/screenSafeArea/InGameHudMixin.java

@@ -185,7 +185,7 @@ public void renderStatusEffectOverlay(MatrixStack matrixStack, CallbackInfo info
     }
 
     // Apply screen borders to Titles, subtitles and other messages.
-    @ModifyArg(method = "render", at = @At(value = "INVOKE",target = "Lnet/minecraft/client/font/TextRenderer;draw(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/text/Text;FFI)I",ordinal = 0),index = 3)
+    @ModifyArg(method = "render", at = @At(value = "INVOKE",target = "Lnet/minecraft/client/font/TextRenderer;drawWithShadow(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/text/Text;FFI)I",ordinal = 0),index = 3)
     public float modifyOverlayMessage(float y){
         return y-screenBorder;
     }