From fa62ef18313671db370018d576f5e3b63bca30bc Mon Sep 17 00:00:00 2001
From: zeng-github01 <95841646+zeng-github01@users.noreply.github.com>
Date: Sun, 29 Mar 2026 12:29:45 +0800
Subject: [PATCH 1/4] Fix NpcJob for legacy npc

---
 .../java/noppes/npcs/VersionCompatibility.java     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/noppes/npcs/VersionCompatibility.java b/src/main/java/noppes/npcs/VersionCompatibility.java
index 98dd6c20e..708659024 100644
--- a/src/main/java/noppes/npcs/VersionCompatibility.java
+++ b/src/main/java/noppes/npcs/VersionCompatibility.java
@@ -1,9 +1,7 @@
 package noppes.npcs;
 
-import net.minecraft.nbt.NBTBase;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagInt;
-import net.minecraft.nbt.NBTTagList;
+import net.minecraft.nbt.*;
+import net.minecraftforge.common.util.Constants;
 import noppes.npcs.controllers.data.Line;
 import noppes.npcs.controllers.data.Lines;
 import noppes.npcs.entity.EntityNPCInterface;
@@ -110,6 +108,14 @@ public static void CheckNpcCompatibility(EntityNPCInterface npc, NBTTagCompound
 
                 compound.setIntArray("StartPosNew", new int[]{x, y, z});
             }
+
+            if (compound.hasKey("NpcJob")) {
+                int npcJob = compound.getInteger("NpcJob");
+                if (npcJob == 5) {
+                    compound.setByte("BossBar", (byte) 1);
+                    compound.setInteger("NpcJob", 0);
+                }
+            }
         }
         if (npc.npcVersion == 13) {
             boolean bo = compound.getBoolean("HealthRegen");

From a05b7d4f1d9c6487204a061559ea595e80fae7f4 Mon Sep 17 00:00:00 2001
From: zeng-github01 <95841646+zeng-github01@users.noreply.github.com>
Date: Sun, 29 Mar 2026 12:31:50 +0800
Subject: [PATCH 2/4] Fix Tint for legacy npc

---
 src/main/java/noppes/npcs/VersionCompatibility.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/noppes/npcs/VersionCompatibility.java b/src/main/java/noppes/npcs/VersionCompatibility.java
index 708659024..0f3060d22 100644
--- a/src/main/java/noppes/npcs/VersionCompatibility.java
+++ b/src/main/java/noppes/npcs/VersionCompatibility.java
@@ -116,6 +116,14 @@ public static void CheckNpcCompatibility(EntityNPCInterface npc, NBTTagCompound
                     compound.setInteger("NpcJob", 0);
                 }
             }
+
+            if (compound.hasKey("SkinColor")) {
+                int skinColor = compound.getInteger("SkinColor");
+                if (skinColor != 16777215) {
+                    compound.setInteger("generalTint", skinColor);
+                    compound.setBoolean("GeneralTintEnabled", true);
+                }
+            }
         }
         if (npc.npcVersion == 13) {
             boolean bo = compound.getBoolean("HealthRegen");

From ee2283b8e65ba01610697a486b29e16da7d8f57f Mon Sep 17 00:00:00 2001
From: zeng-github01 <95841646+zeng-github01@users.noreply.github.com>
Date: Sun, 29 Mar 2026 12:54:01 +0800
Subject: [PATCH 3/4] Fix wrong key

---
 src/main/java/noppes/npcs/VersionCompatibility.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/noppes/npcs/VersionCompatibility.java b/src/main/java/noppes/npcs/VersionCompatibility.java
index 0f3060d22..d93fe0972 100644
--- a/src/main/java/noppes/npcs/VersionCompatibility.java
+++ b/src/main/java/noppes/npcs/VersionCompatibility.java
@@ -2,6 +2,7 @@
 
 import net.minecraft.nbt.*;
 import net.minecraftforge.common.util.Constants;
+import noppes.npcs.constants.EnumPotionType;
 import noppes.npcs.controllers.data.Line;
 import noppes.npcs.controllers.data.Lines;
 import noppes.npcs.entity.EntityNPCInterface;
@@ -120,7 +121,7 @@ public static void CheckNpcCompatibility(EntityNPCInterface npc, NBTTagCompound
             if (compound.hasKey("SkinColor")) {
                 int skinColor = compound.getInteger("SkinColor");
                 if (skinColor != 16777215) {
-                    compound.setInteger("generalTint", skinColor);
+                    compound.setInteger("GeneralTint", skinColor);
                     compound.setBoolean("GeneralTintEnabled", true);
                 }
             }

From d44223c00cc92a5e85b90b78d30b529fac7e476d Mon Sep 17 00:00:00 2001
From: zeng-github01 <95841646+zeng-github01@users.noreply.github.com>
Date: Sun, 29 Mar 2026 14:19:08 +0800
Subject: [PATCH 4/4] Revert

---
 src/main/java/noppes/npcs/VersionCompatibility.java | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/main/java/noppes/npcs/VersionCompatibility.java b/src/main/java/noppes/npcs/VersionCompatibility.java
index d93fe0972..cf26c3874 100644
--- a/src/main/java/noppes/npcs/VersionCompatibility.java
+++ b/src/main/java/noppes/npcs/VersionCompatibility.java
@@ -117,14 +117,6 @@ public static void CheckNpcCompatibility(EntityNPCInterface npc, NBTTagCompound
                     compound.setInteger("NpcJob", 0);
                 }
             }
-
-            if (compound.hasKey("SkinColor")) {
-                int skinColor = compound.getInteger("SkinColor");
-                if (skinColor != 16777215) {
-                    compound.setInteger("GeneralTint", skinColor);
-                    compound.setBoolean("GeneralTintEnabled", true);
-                }
-            }
         }
         if (npc.npcVersion == 13) {
             boolean bo = compound.getBoolean("HealthRegen");