Fix deselecting the npc not clearing path

Author: samolego

common/src/main/java/org/samo_lego/taterzens/mixin/network/ServerGamePacketListenerImplMixin_PacketFaker.java

@@ -94,7 +94,13 @@ private void changeEntityType(Packet<?> packet, PacketSendListener listener, Cal
                     Arrays.asList(new ClientboundPlayerInfoPacket.PlayerUpdate(profile, 0, GameType.SURVIVAL, npc.getTabListName(), null))
             );
             this.send(playerAddPacket, listener);
+
             // Vanilla sends the packet twice
+            playerAddPacket = new ClientboundPlayerInfoPacket(ADD_PLAYER);
+            //noinspection ConstantConditions
+            ((ClientboundPlayerInfoPacketAccessor) playerAddPacket).setEntries(
+                    Arrays.asList(new ClientboundPlayerInfoPacket.PlayerUpdate(profile, 0, GameType.SURVIVAL, npc.getTabListName(), null))
+            );
             this.send(playerAddPacket, listener);
 
             // Before we send this packet, we have

common/src/main/java/org/samo_lego/taterzens/mixin/player/ServerPlayerMixinCast_ITaterzenEditor.java

@@ -29,32 +29,33 @@
 @Mixin(ServerPlayer.class)
 public abstract class ServerPlayerMixinCast_ITaterzenEditor implements ITaterzenEditor {
 
-    private final ServerPlayer player = (ServerPlayer) (Object) this;
+    @Unique
+    private final ServerPlayer self = (ServerPlayer) (Object) this;
 
     @Unique
-    private TaterzenNPC taterzens$selectedNpc;
+    private TaterzenNPC selectedNpc;
     @Unique
-    private int taterzens$selectedMsgId = -1; // -1 as no selected msg to edit
+    private int selectedMsgId = -1; // -1 as no selected msg to edit
 
     @Unique
-    private byte taterzens$lastRenderTick;
+    private byte lastRenderTick;
     @Unique
-    private EditorMode taterzens$editorMode = EditorMode.NONE;
+    private EditorMode editorMode = EditorMode.NONE;
 
     /**
      * Used for showing the path particles.
      */
     @Inject(method = "tick()V", at = @At("TAIL"))
     private void tick(CallbackInfo ci) {
-        ITaterzenEditor editor = (ITaterzenEditor) this.player;
-        if(editor.getNpc() != null && taterzens$lastRenderTick++ > 4) {
-            if(this.taterzens$editorMode == EditorMode.PATH) {
+        ITaterzenEditor editor = (ITaterzenEditor) this.self;
+        if (editor.getNpc() != null && lastRenderTick++ > 4) {
+            if (this.editorMode == EditorMode.PATH) {
                 ArrayList<BlockPos> pathTargets = editor.getNpc().getPathTargets();
                 DustParticleOptions effect = new DustParticleOptions(
                         new Vector3f(
-                            config.path.color.red / 255.0F,
-                            config.path.color.green / 255.0F,
-                            config.path.color.blue / 255.0F
+                                config.path.color.red / 255.0F,
+                                config.path.color.green / 255.0F,
+                                config.path.color.blue / 255.0F
                         ),
                         1.0F
                 );
@@ -68,45 +69,50 @@ private void tick(CallbackInfo ci) {
                     int deltaZ = pos.getZ() - nextPos.getZ();
 
                     double distance = Math.sqrt(pos.distSqr(nextPos));
-                    for(double j = 0; j < distance; j += 0.5D) {
+                    for (double j = 0; j < distance; j += 0.5D) {
                         double x = pos.getX() - j / distance * deltaX;
                         double y = pos.getY() - j / distance * deltaY;
                         double z = pos.getZ() - j / distance * deltaZ;
                         ClientboundLevelParticlesPacket packet = new ClientboundLevelParticlesPacket(effect, true, x + 0.5D, y + 1.5D, z + 0.5D, 0.1F, 0.1F, 0.1F, 1.0F, 1);
-                        this.player.connection.send(packet);
+                        this.self.connection.send(packet);
                     }
                 }
             }
-            if(this.taterzens$editorMode != EditorMode.NONE) {
-                player.displayClientMessage(successText("taterzens.tooltip.current_editor", String.valueOf(this.taterzens$editorMode)), true);
+            if (this.editorMode != EditorMode.NONE) {
+                self.displayClientMessage(successText("taterzens.tooltip.current_editor", String.valueOf(this.editorMode)), true);
             }
 
-            this.taterzens$lastRenderTick = 0;
+            this.lastRenderTick = 0;
         }
     }
 
     @Override
     public void setEditorMode(EditorMode mode) {
-        ITaterzenEditor editor = (ITaterzenEditor) this.player;
-        if(editor.getNpc() != null) {
-            Level world = player.getLevel();
-            if(this.taterzens$editorMode == EditorMode.PATH && mode != EditorMode.PATH) {
-                editor.getNpc().getPathTargets().forEach(blockPos -> player.connection.send(
+        ITaterzenEditor editor = (ITaterzenEditor) this.self;
+
+        if (editor.getNpc() != null) {
+            Level world = self.getLevel();
+            if (this.editorMode == EditorMode.PATH && mode != EditorMode.PATH) {
+                editor.getNpc().getPathTargets().forEach(blockPos -> self.connection.send(
                         new ClientboundBlockUpdatePacket(blockPos, world.getBlockState(blockPos))
                 ));
-            } else if(this.taterzens$editorMode != EditorMode.PATH && mode == EditorMode.PATH) {
-                editor.getNpc().getPathTargets().forEach(blockPos -> player.connection.send(
+            } else if (this.editorMode != EditorMode.PATH && mode == EditorMode.PATH) {
+                editor.getNpc().getPathTargets().forEach(blockPos -> self.connection.send(
                         new ClientboundBlockUpdatePacket(blockPos, Blocks.REDSTONE_BLOCK.defaultBlockState())
                 ));
             }
+
+            if (this.editorMode == EditorMode.MESSAGES && mode != EditorMode.MESSAGES) {
+                this.setEditingMessageIndex(-1);
+            }
         }
 
-        this.taterzens$editorMode = mode;
+        this.editorMode = mode;
     }
 
     @Override
     public EditorMode getEditorMode() {
-        return this.taterzens$editorMode;
+        return this.editorMode;
     }
 
     /**
@@ -116,35 +122,42 @@ public EditorMode getEditorMode() {
     @Nullable
     @Override
     public TaterzenNPC getNpc() {
-        return this.taterzens$selectedNpc;
+        return this.selectedNpc;
     }
 
     @Override
     public boolean selectNpc(@Nullable TaterzenNPC npc) {
-        if (npc != null && !npc.allowEditBy(this.player) &&
-            !Taterzens.getInstance().getPlatform().checkPermission(
-                    this.player.createCommandSourceStack(), "taterzens.npc.select.bypass", config.perms.selectBypassLevel)) {
+        if (npc != null && !npc.allowEditBy(this.self) &&
+                !Taterzens.getInstance().getPlatform().checkPermission(
+                        this.self.createCommandSourceStack(), "taterzens.npc.select.bypass", config.perms.selectBypassLevel)) {
             return false;
         }
 
-        TaterzenNPC selectedNpc = this.taterzens$selectedNpc;
-        this.taterzens$selectedNpc = npc;
+        if (this.getEditorMode() != EditorMode.NONE) {
+            this.setEditorMode(EditorMode.NONE);
+        }
 
-        if(npc != null)
+        TaterzenNPC selectedNpc = this.selectedNpc;
+        this.selectedNpc = npc;
+
+        if (npc != null) {
             npc.sendProfileUpdates();
-        if(selectedNpc != null)
+        }
+
+        if (selectedNpc != null) {
             selectedNpc.sendProfileUpdates();
+        }
 
         return true;
     }
 
     @Override
     public void setEditingMessageIndex(int selected) {
-        this.taterzens$selectedMsgId = selected;
+        this.selectedMsgId = selected;
     }
 
     @Override
     public int getEditingMessageIndex() {
-        return this.taterzens$selectedMsgId;
+        return this.selectedMsgId;
     }
 }