没隔离干净，继续隔离

Author: Viola-Siemens

src/main/java/com/hexagram2021/real_peaceful_mode/client/ScreenManager.java

@@ -1,13 +1,35 @@
 package com.hexagram2021.real_peaceful_mode.client;
 
 import com.hexagram2021.real_peaceful_mode.client.screens.MissionListScreen;
+import com.hexagram2021.real_peaceful_mode.common.crafting.MessagedMission;
+import com.hexagram2021.real_peaceful_mode.common.crafting.menu.MissionMessageMenu;
 import com.hexagram2021.real_peaceful_mode.common.mission.MissionManager;
+import com.hexagram2021.real_peaceful_mode.common.util.RPMLogger;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.AbstractContainerMenu;
 
 import java.util.List;
+import java.util.Objects;
 
 public final class ScreenManager {
 	public static void openMissionListScreen(List<MissionManager.Mission> activeMissions, List<MissionManager.Mission> finishedMissions) {
 		Minecraft.getInstance().setScreen(new MissionListScreen(activeMissions, finishedMissions));
 	}
+
+	public static void openMissionMessageScreen(MessagedMission mission, int containerId) {
+		LocalPlayer player = Minecraft.getInstance().player;
+		RPMLogger.debug(mission.createTag());
+		if(player != null) {
+			AbstractContainerMenu menu = player.containerMenu;
+			if(menu.containerId == containerId && menu instanceof MissionMessageMenu missionMessageMenu) {
+				missionMessageMenu.setMission(mission);
+			}
+		}
+	}
+
+	public static Player getLocalPlayer() {
+		return Objects.requireNonNull(Minecraft.getInstance().player);
+	}
 }

src/main/java/com/hexagram2021/real_peaceful_mode/common/crafting/MessagedMissionInstance.java

@@ -1,8 +1,8 @@
 package com.hexagram2021.real_peaceful_mode.common.crafting;
 
 import com.google.common.collect.ImmutableList;
+import com.hexagram2021.real_peaceful_mode.client.ScreenManager;
 import com.hexagram2021.real_peaceful_mode.common.mission.MissionManager;
-import net.minecraft.client.Minecraft;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
@@ -11,7 +11,6 @@
 
 import javax.annotation.Nullable;
 import java.util.List;
-import java.util.Objects;
 
 public class MessagedMissionInstance implements MessagedMission {
 	private final Player player;
@@ -26,11 +25,11 @@ public MessagedMissionInstance(Player player, @Nullable LivingEntity npc, List<M
 	}
 
 	public MessagedMissionInstance(CompoundTag nbt) {
-		this.player = Minecraft.getInstance().player;
+		this.player = ScreenManager.getLocalPlayer();
 		LivingEntity npc = null;
 		if(nbt.contains(NPC_ID, Tag.TAG_INT)) {
 			int npcId = nbt.getInt(NPC_ID);
-			npc = (LivingEntity) Objects.requireNonNull(this.player).level().getEntity(npcId);
+			npc = (LivingEntity) this.player.level().getEntity(npcId);
 		}
 		this.npc = npc;
 		ListTag list = nbt.getList(MESSAGE_LIST, Tag.TAG_COMPOUND);

src/main/java/com/hexagram2021/real_peaceful_mode/network/ClientboundMissionMessagePacket.java

@@ -1,13 +1,9 @@
 package com.hexagram2021.real_peaceful_mode.network;
 
+import com.hexagram2021.real_peaceful_mode.client.ScreenManager;
 import com.hexagram2021.real_peaceful_mode.common.crafting.MessagedMission;
 import com.hexagram2021.real_peaceful_mode.common.crafting.MessagedMissionInstance;
-import com.hexagram2021.real_peaceful_mode.common.crafting.menu.MissionMessageMenu;
-import com.hexagram2021.real_peaceful_mode.common.util.RPMLogger;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraftforge.network.NetworkEvent;
 
 import java.util.Objects;
@@ -34,13 +30,6 @@ public void write(FriendlyByteBuf buf) {
 
 	@Override
 	public void handle(NetworkEvent.Context context) {
-		LocalPlayer player = Minecraft.getInstance().player;
-		RPMLogger.debug(this.mission.createTag());
-		if(player != null) {
-			AbstractContainerMenu menu = player.containerMenu;
-			if(menu.containerId == this.containerId && menu instanceof MissionMessageMenu missionMessageMenu) {
-				missionMessageMenu.setMission(mission);
-			}
-		}
+		ScreenManager.openMissionMessageScreen(this.mission, this.containerId);
 	}
 }