From b783d659d30f128923faa693ef0af68ee14f8f7c Mon Sep 17 00:00:00 2001
From: "Luis C.M" <42545778+c0508383@users.noreply.github.com>
Date: Fri, 4 Nov 2022 13:32:08 -0500
Subject: [PATCH] ModelMPM & RenderNPCInterface: -Fixed console spam for
 missing NPC skin and skin overlay textures.

---
 src/main/java/noppes/npcs/client/model/ModelMPM.java  |  6 ++----
 .../npcs/client/renderer/RenderNPCInterface.java      | 11 ++++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/noppes/npcs/client/model/ModelMPM.java b/src/main/java/noppes/npcs/client/model/ModelMPM.java
index 2f25edeac..416425af6 100644
--- a/src/main/java/noppes/npcs/client/model/ModelMPM.java
+++ b/src/main/java/noppes/npcs/client/model/ModelMPM.java
@@ -357,9 +357,6 @@ public class ModelMPM extends ModelNPCMale{
 				if (!npc.display.skinOverlayData.overlayList.isEmpty()) {
 					for (ISkinOverlay overlayData : npc.display.skinOverlayData.overlayList.values()) {
 						try {
-							if (overlayData.getTexture().isEmpty())
-								continue;
-
 							if (((SkinOverlay)overlayData).getLocation() == null) {
 								((SkinOverlay)overlayData).setLocation(new ResourceLocation(overlayData.getTexture()));
 							} else {
@@ -369,7 +366,8 @@ public class ModelMPM extends ModelNPCMale{
 								}
 							}
 
-							if (((SkinOverlay)overlayData).getLocation().getResourcePath().isEmpty())
+							if (overlayData.getTexture().isEmpty() || ((SkinOverlay)overlayData).getLocation() == null
+									|| ((SkinOverlay)overlayData).getLocation().getResourcePath().isEmpty())
 								continue;
 
 							try {
diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java
index d32b92578..de377dbec 100644
--- a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java
+++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java
@@ -23,6 +23,7 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.boss.BossStatus;
+import net.minecraft.util.ReportedException;
 import net.minecraft.util.ResourceLocation;
 import noppes.npcs.client.ImageDownloadAlt;
 import noppes.npcs.client.model.ModelMPM;
@@ -220,15 +221,14 @@ public class RenderNPCInterface extends RenderLiving{
 	}
 
 	protected void renderModel(EntityLivingBase entityliving, float par2, float par3, float par4, float par5, float par6, float par7) {
-		super.renderModel(entityliving, par2, par3, par4, par5, par6, par7);
 		EntityNPCInterface npc = (EntityNPCInterface) entityliving;
+		if (this.getEntityTexture(entityliving) != null) {
+			super.renderModel(entityliving, par2, par3, par4, par5, par6, par7);
+		}
 
 		if (!npc.display.skinOverlayData.overlayList.isEmpty()) {
 			for (ISkinOverlay overlayData : npc.display.skinOverlayData.overlayList.values()) {
 				try {
-					if (overlayData.getTexture().isEmpty())
-						continue;
-
 					if (((SkinOverlay)overlayData).getLocation() == null) {
 						((SkinOverlay)overlayData).setLocation(new ResourceLocation(overlayData.getTexture()));
 					} else {
@@ -238,7 +238,8 @@ public class RenderNPCInterface extends RenderLiving{
 						}
 					}
 
-					if (((SkinOverlay)overlayData).getLocation().getResourcePath().isEmpty())
+					if (overlayData.getTexture().isEmpty() || ((SkinOverlay)overlayData).getLocation() == null
+							|| ((SkinOverlay)overlayData).getLocation().getResourcePath().isEmpty())
 						continue;
 
 					try {