diff --git a/src/main/java/noppes/npcs/ModelPartData.java b/src/main/java/noppes/npcs/ModelPartData.java index 2cbe59974..53be6c7fd 100644 --- a/src/main/java/noppes/npcs/ModelPartData.java +++ b/src/main/java/noppes/npcs/ModelPartData.java @@ -35,6 +35,10 @@ public class ModelPartData { type = compound.getByte("Type"); color = compound.getInteger("Color"); texture = compound.getString("Texture"); + // Disable MPM Dependency for Part Textures + if(VersionCompatibility.ModRev < 19){ + texture = texture.replace("moreplayermodels:textures", "customnpcs:textures/parts"); + } playerTexture = compound.getBoolean("PlayerTexture"); location = null; } diff --git a/src/main/java/noppes/npcs/VersionCompatibility.java b/src/main/java/noppes/npcs/VersionCompatibility.java index 77e33a084..c91aa1c26 100644 --- a/src/main/java/noppes/npcs/VersionCompatibility.java +++ b/src/main/java/noppes/npcs/VersionCompatibility.java @@ -10,17 +10,15 @@ import net.minecraft.nbt.NBTTagList; import noppes.npcs.controllers.data.Line; import noppes.npcs.controllers.data.Lines; import noppes.npcs.entity.EntityNPCInterface; +import org.lwjgl.Sys; public class VersionCompatibility { - public static int ModRev = 18; + public static int ModRev = 19; public static void CheckNpcCompatibility(EntityNPCInterface npc, NBTTagCompound compound){ if(npc.npcVersion == ModRev) return; if(npc.npcVersion < 18){ - - // Fix 64-Texture (Reorganization) - // Fix CloakTexture (Reorganization) String cloakTexture = compound.getString("CloakTexture"); cloakTexture = cloakTexture.replace("/cloak/Daybreak/", "/cloak/Guilds/Daybreak/"); @@ -33,17 +31,13 @@ public class VersionCompatibility { if(compound.hasKey("DialogDarkenScreen")){ compound.removeTag("DialogDarkenScreen"); } - // Remove MPM Texture Requirement - String texture = compound.getString("Texture"); - texture = texture.replace("moreplayermodels:textures", "customnpcs:textures/parts"); - compound.setString("Texture", texture); } if(npc.npcVersion < 12){ CompatabilityFix(compound, npc.advanced.writeToNBT(new NBTTagCompound())); CompatabilityFix(compound, npc.ai.writeToNBT(new NBTTagCompound())); CompatabilityFix(compound, npc.stats.writeToNBT(new NBTTagCompound())); - CompatabilityFix(compound, npc.display.writeToNBT(new NBTTagCompound())); - CompatabilityFix(compound, npc.inventory.writeEntityToNBT(new NBTTagCompound())); + CompatabilityFix(compound, npc.display.writeToNBT(new NBTTagCompound())); + CompatabilityFix(compound, npc.inventory.writeEntityToNBT(new NBTTagCompound())); } if(npc.npcVersion < 5){ String texture = compound.getString("Texture"); diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index 8ea79f11b..2a279e4ae 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -928,7 +928,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti super.readEntityFromNBT(compound); npcVersion = compound.getInteger("ModRev"); VersionCompatibility.CheckNpcCompatibility(this, compound); - + display.readToNBT(compound); stats.readToNBT(compound); ai.readToNBT(compound);