Update to 1.19.1

Author: Patbox

.github/workflows/release.yml

@@ -42,6 +42,6 @@ jobs:
             - name: Build and publish with Gradle
               run: ./gradlew build publish
               env:
-                  #CURSEFORGE: ${{ secrets.CURSEFORGE }}
+                  CURSEFORGE: ${{ secrets.CURSEFORGE }}
                   MODRINTH: ${{ secrets.MODRINTH }}
                   CHANGELOG: ${{ github.event.release.body }}

build.gradle

@@ -322,7 +322,7 @@ if (System.getenv("MODRINTH")) {
         versionType = "release"
         uploadFile = remapJar
         gameVersions = [((String) project.mc_version)]
-        loaders = ["fabric"]
+        loaders = ["fabric", "quilt"]
         changelog = System.getenv("CHANGELOG")
     }
 

gradle.properties

@@ -2,12 +2,12 @@
 org.gradle.jvmargs=-Xmx3G
 
 # Mod properties
-mod_version=1.101.1
+mod_version=1.101.2
 
 # Minecraft properties
-mc_version=1.19
-fabric_api_version=0.56.0+1.19
-fabric_loader_version=0.14.6
+mc_version=1.19.1
+fabric_api_version=0.58.5+1.19.1
+fabric_loader_version=0.14.8
 
-modmenu_version=4.0.0
+modmenu_version=4.0.5
 netty_http_version=4.1.77.Final

src/main/java/dan200/computercraft/api/turtle/FakePlayer.java

@@ -8,12 +8,8 @@
 import com.mojang.authlib.GameProfile;
 import dan200.computercraft.shared.util.FakeNetHandler;
 import net.minecraft.commands.arguments.EntityAnchorArgument;
-import net.minecraft.network.chat.ChatSender;
-import net.minecraft.network.chat.ChatType;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.PlayerChatMessage;
+import net.minecraft.network.chat.*;
 import net.minecraft.network.protocol.Packet;
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.sounds.SoundEvent;
@@ -215,7 +211,12 @@ public void teleportTo( double x, double y, double z )
 
 
     @Override
-    public void sendChatMessage( PlayerChatMessage playerChatMessage, ChatSender chatSender, ResourceKey<ChatType> resourceKey )
+    public void sendChatMessage( OutgoingPlayerChatMessage outgoingPlayerChatMessage, boolean bl, ChatType.Bound bound )
+    {
+    }
+
+    @Override
+    public void sendSystemMessage( Component component, boolean bl )
     {
     }
 

src/main/java/dan200/computercraft/client/ClientTableFormatter.java

@@ -5,23 +5,30 @@
  */
 package dan200.computercraft.client;
 
-import dan200.computercraft.fabric.mixin.ChatComponentAccess;
+import com.google.common.primitives.Ints;
 import dan200.computercraft.shared.command.text.ChatHelpers;
 import dan200.computercraft.shared.command.text.TableBuilder;
 import dan200.computercraft.shared.command.text.TableFormatter;
+import it.unimi.dsi.fastutil.bytes.ByteArrayList;
+import it.unimi.dsi.fastutil.bytes.ByteList;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 import net.minecraft.ChatFormatting;
+import net.minecraft.client.GuiMessageTag;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.components.ChatComponent;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MessageSignature;
 import net.minecraft.util.Mth;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Nullable;
+import java.nio.charset.StandardCharsets;
 
 public class ClientTableFormatter implements TableFormatter
 {
+    private static final byte[] COMPUTER_CRAFT_BYTES = "ComputerCraft".getBytes( StandardCharsets.UTF_8 );
+
     public static final ClientTableFormatter INSTANCE = new ClientTableFormatter();
 
     private static final Int2IntOpenHashMap lastHeights = new Int2IntOpenHashMap();
@@ -69,7 +76,8 @@ public void writeLine( int id, Component component )
         // int maxWidth = MathHelper.floor( chat.getChatWidth() / chat.getScale() );
         // List<ITextProperties> list = RenderComponentsUtil.wrapComponents( component, maxWidth, mc.fontRenderer );
         // if( !list.isEmpty() ) chat.printChatMessageWithOptionalDeletion( list.get( 0 ), id );
-        ((ChatComponentAccess) chat).callAddMessage( component, id );
+
+        chat.addMessage( component, createMessageSignature( id ), GuiMessageTag.system() );
     }
 
     @Override
@@ -82,7 +90,17 @@ public int display( TableBuilder table )
         int height = TableFormatter.super.display( table );
         lastHeights.put( table.getId(), height );
 
-        for( int i = height; i < lastHeight; i++ ) ((ChatComponentAccess) chat).callRemoveById( i + table.getId() );
+        for( int i = height; i < lastHeight; i++ ) chat.deleteMessage( createMessageSignature( i + table.getId() ) );
         return height;
     }
+
+    public MessageSignature createMessageSignature( int id )
+    {
+        ByteList list = new ByteArrayList();
+
+        list.addElements( 0, Ints.toByteArray( id ) );
+        list.addElements( list.size(), COMPUTER_CRAFT_BYTES );
+
+        return new MessageSignature( list.toByteArray() );
+    }
 }

src/main/java/dan200/computercraft/fabric/mixin/ChatComponentAccess.java

@@ -63,7 +63,7 @@ private Object[] doCommand( String command )
         try
         {
             receiver.clearOutput();
-            int result = commandManager.performCommand( computer.getSource(), command );
+            int result = commandManager.performPrefixedCommand( computer.getSource(), command );
             return new Object[] { result > 0, receiver.copyOutput(), result };
         }
         catch( Throwable t )

src/main/java/dan200/computercraft/shared/computer/apis/CommandAPI.java

@@ -9,11 +9,10 @@
 import dan200.computercraft.fabric.mixin.ConnectionAccess;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.embedded.EmbeddedChannel;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
 import net.minecraft.network.Connection;
 import net.minecraft.network.ConnectionProtocol;
 import net.minecraft.network.PacketListener;
+import net.minecraft.network.PacketSendListener;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.PacketFlow;
@@ -183,7 +182,7 @@ public void send( @Nonnull Packet<?> packet )
     }
 
     @Override
-    public void send( @Nonnull Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> whenSent )
+    public void send( Packet<?> packet, @org.jetbrains.annotations.Nullable PacketSendListener packetSendListener )
     {
     }
 
@@ -325,7 +324,7 @@ public void send( @Nonnull Packet<?> packet )
         }
 
         @Override
-        public void send( @Nonnull Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> whenSent )
+        public void send( Packet<?> packet, @org.jetbrains.annotations.Nullable PacketSendListener packetSendListener )
         {
         }
 

src/main/java/dan200/computercraft/shared/util/FakeNetHandler.java

@@ -16,7 +16,6 @@
   ],
   "client": [
     "BlockRenderDispatcherMixin",
-    "ChatComponentAccess",
     "ItemInHandRendererAccess",
     "MixinGameRenderer",
     "MixinItemFrameRenderer",

src/main/resources/computercraft.mixins.json

@@ -18,12 +18,13 @@
         "Merith.TK",
         "Jummit",
 		"Toad-Dev",
-        "3prm3"
+        "3prm3",
+        "Patbox"
     ],
     "depends": {
-        "minecraft": ">=1.19 <1.20",
-        "fabricloader": ">=0.14.6",
-        "fabric": ">=0.51.1"
+        "minecraft": ">=1.19.1 <1.20",
+        "fabricloader": ">=0.14.8",
+        "fabric": ">=0.58.4"
     },
     "suggests": {
         "modmenu": "*"