Move chat event handling to ChatBoxPeripheral

 - Removes the use of ServerComputer within the turtle upgrade (less
   touching of CC internals \o/).
 - Fixes issues where only one turtle would receive chat messages, as
   the lastConsumedMessage was upgrade-wide.

Author: SquidDev

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ChatBoxPeripheral.java

@@ -5,6 +5,7 @@
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.api.lua.LuaFunction;
 import dan200.computercraft.api.lua.MethodResult;
+import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.api.pocket.IPocketAccess;
 import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.TurtleSide;
@@ -15,6 +16,7 @@
 import de.srendi.advancedperipherals.common.addons.computercraft.owner.TurtlePeripheralOwner;
 import de.srendi.advancedperipherals.common.blocks.base.PeripheralBlockEntity;
 import de.srendi.advancedperipherals.common.configuration.APConfig;
+import de.srendi.advancedperipherals.common.events.Events;
 import de.srendi.advancedperipherals.common.util.CoordUtil;
 import de.srendi.advancedperipherals.lib.peripherals.BasePeripheral;
 import de.srendi.advancedperipherals.lib.peripherals.IPeripheralFunction;
@@ -35,9 +37,12 @@ public class ChatBoxPeripheral extends BasePeripheral<IPeripheralOwner> {
 
     public static final String PERIPHERAL_TYPE = "chatBox";
 
+    private long lastConsumedMessage;
+
     protected ChatBoxPeripheral(IPeripheralOwner owner) {
         super(PERIPHERAL_TYPE, owner);
         owner.attachOperation(CHAT_MESSAGE);
+        lastConsumedMessage = Events.getLastChatMessageID() - 1;
     }
 
     public ChatBoxPeripheral(PeripheralBlockEntity<?> tileEntity) {
@@ -217,4 +222,12 @@ public final MethodResult sendMessageToPlayer(@NotNull IArguments arguments) thr
             return MethodResult.of(true);
         });
     }
+
+    public void update() {
+        lastConsumedMessage = Events.traverseChatMessages(lastConsumedMessage, message -> {
+            for (IComputerAccess computer : getConnectedComputers()) {
+                computer.queueEvent("chat", message.username(), message.message(), message.uuid(), message.isHidden());
+            }
+        });
+    }
 }

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/turtles/TurtleChatBoxUpgrade.java

@@ -2,25 +2,17 @@
 
 import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.TurtleSide;
-import dan200.computercraft.shared.computer.core.ServerComputer;
-import dan200.computercraft.shared.turtle.blocks.TileTurtle;
 import de.srendi.advancedperipherals.AdvancedPeripherals;
 import de.srendi.advancedperipherals.common.addons.computercraft.peripheral.ChatBoxPeripheral;
-import de.srendi.advancedperipherals.common.events.Events;
 import de.srendi.advancedperipherals.lib.turtle.PeripheralTurtleUpgrade;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.entity.BlockEntity;
 import org.jetbrains.annotations.NotNull;
 
 public class TurtleChatBoxUpgrade extends PeripheralTurtleUpgrade<ChatBoxPeripheral> {
-
-    private long lastConsumedMessage;
-
     public TurtleChatBoxUpgrade(ResourceLocation id, ItemStack item) {
         super(id, item);
-        lastConsumedMessage = Events.getLastChatMessageID() - 1;
     }
 
     @Override
@@ -44,13 +36,6 @@ public void update(@NotNull ITurtleAccess turtle, @NotNull TurtleSide side) {
         if (turtle.getLevel().isClientSide)
             return;
 
-        if (turtle.getUpgrade(side) instanceof TurtleChatBoxUpgrade) {
-            BlockEntity tile = turtle.getLevel().getBlockEntity(turtle.getPosition());
-            if (tile instanceof TileTurtle tileTurtle) {
-                ServerComputer computer = tileTurtle.getServerComputer();
-                lastConsumedMessage = Events.traverseChatMessages(lastConsumedMessage, message -> computer.queueEvent("chat", new Object[]{message.username(), message.message(), message.uuid(), message.isHidden()}));
-
-            }
-        }
+        if (turtle.getPeripheral(side) instanceof ChatBoxPeripheral chatBox) chatBox.update();
     }
 }

src/main/java/de/srendi/advancedperipherals/common/blocks/blockentities/ChatBoxEntity.java

@@ -2,7 +2,6 @@
 
 import de.srendi.advancedperipherals.common.addons.computercraft.peripheral.ChatBoxPeripheral;
 import de.srendi.advancedperipherals.common.blocks.base.PeripheralBlockEntity;
-import de.srendi.advancedperipherals.common.events.Events;
 import de.srendi.advancedperipherals.common.setup.BlockEntityTypes;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
@@ -12,12 +11,8 @@
 import org.jetbrains.annotations.NotNull;
 
 public class ChatBoxEntity extends PeripheralBlockEntity<ChatBoxPeripheral> {
-
-    private Long lastConsumedMessage;
-
     public ChatBoxEntity(BlockPos pos, BlockState state) {
         super(BlockEntityTypes.CHAT_BOX.get(), pos, state);
-        lastConsumedMessage = Events.getLastChatMessageID() - 1;
     }
 
     @NotNull
@@ -28,6 +23,6 @@ protected ChatBoxPeripheral createPeripheral() {
 
     @Override
     public <T extends BlockEntity> void handleTick(Level level, BlockState state, BlockEntityType<T> type) {
-        lastConsumedMessage = Events.traverseChatMessages(lastConsumedMessage, message -> getConnectedComputers().forEach(computer -> computer.queueEvent("chat", message.username(), message.message(), message.uuid(), message.isHidden())));
+        if (peripheral != null) peripheral.update();
     }
 }