From f77a2ff1015f49f30e1aaf2e02894367b6dd9a4e Mon Sep 17 00:00:00 2001
From: Kam <KamronGaming@gmail.com>
Date: Tue, 16 May 2023 17:45:23 -0400
Subject: [PATCH] Remove more threading

---
 src/main/java/noppes/npcs/Server.java         | 20 +++++++++----------
 .../npcs/containers/ContainerCustomGui.java   |  1 -
 .../npcs/controllers/data/PlayerData.java     |  4 +---
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/main/java/noppes/npcs/Server.java b/src/main/java/noppes/npcs/Server.java
index 45c7d0022..d5df0cc35 100644
--- a/src/main/java/noppes/npcs/Server.java
+++ b/src/main/java/noppes/npcs/Server.java
@@ -51,17 +51,15 @@ public class Server {
 	}
 
 	public static void sendAssociatedData(final Entity entity, final EnumPacketClient enu, final Object... obs) {
-		CustomNPCsThreader.runTack(() -> {
-			ByteBuf buffer = Unpooled.buffer();
-			try {
-				if(!fillBuffer(buffer, enu, obs))
-					return;
-				TargetPoint point = new TargetPoint(entity.dimension, entity.posX, entity.posY, entity.posZ, 60);
-				CustomNpcs.Channel.sendToAllAround(new FMLProxyPacket(buffer,"CustomNPCs"), point);
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		});
+		ByteBuf buffer = Unpooled.buffer();
+		try {
+			if(!fillBuffer(buffer, enu, obs))
+				return;
+			TargetPoint point = new TargetPoint(entity.dimension, entity.posX, entity.posY, entity.posZ, 60);
+			CustomNpcs.Channel.sendToAllAround(new FMLProxyPacket(buffer,"CustomNPCs"), point);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
 	}
 	public static void sendToAll(EnumPacketClient enu, Object... obs) {
 		ByteBuf buffer = Unpooled.buffer();
diff --git a/src/main/java/noppes/npcs/containers/ContainerCustomGui.java b/src/main/java/noppes/npcs/containers/ContainerCustomGui.java
index 77662bb95..e195ee609 100644
--- a/src/main/java/noppes/npcs/containers/ContainerCustomGui.java
+++ b/src/main/java/noppes/npcs/containers/ContainerCustomGui.java
@@ -17,7 +17,6 @@ import noppes.npcs.api.gui.IItemSlot;
 import noppes.npcs.client.gui.custom.components.CustomGuiSlot;
 import noppes.npcs.scripted.NpcAPI;
 import noppes.npcs.scripted.gui.ScriptGui;
-import noppes.npcs.util.CustomNPCsThreader;
 
 import java.util.Iterator;
 
diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerData.java b/src/main/java/noppes/npcs/controllers/data/PlayerData.java
index 7a0ba4889..86d7a51ef 100644
--- a/src/main/java/noppes/npcs/controllers/data/PlayerData.java
+++ b/src/main/java/noppes/npcs/controllers/data/PlayerData.java
@@ -25,8 +25,6 @@ import noppes.npcs.util.NBTJsonUtil;
 import java.io.File;
 import java.io.FileInputStream;
 
-import static noppes.npcs.util.CustomNPCsThreader.playerDataThread;
-
 public class PlayerData implements IExtendedEntityProperties, IPlayerData {
 	public PlayerDialogData dialogData = new PlayerDialogData(this);
 	public PlayerBankData bankData = new PlayerBankData(this);
@@ -304,7 +302,7 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
 	public synchronized void save() {
 		final NBTTagCompound compound = getNBT();
 		final String filename = uuid + ".json";
-		playerDataThread.execute(() -> {
+		CustomNPCsThreader.playerDataThread.execute(() -> {
 			try {
 				File saveDir = PlayerDataController.instance.getSaveDir();
 				File file = new File(saveDir, filename + "_new");