From 71aff8f78f2ce86e503de486a7bab785a5ae8bf9 Mon Sep 17 00:00:00 2001
From: "Luis C.M" <lc0508383@gmail.com>
Date: Mon, 16 May 2022 01:22:33 -0500
Subject: [PATCH] Fix for updating overlay and powered textures.

---
 .../npcs/client/renderer/RenderNPCInterface.java      | 11 +++++++++++
 .../java/noppes/npcs/scripted/entity/ScriptNpc.java   |  9 ++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java
index 9914fe4f8..89f2bc4db 100644
--- a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java
+++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java
@@ -215,7 +215,13 @@ public class RenderNPCInterface extends RenderLiving{
 		{
 			if(npc.textureGlowLocation == null){
 				npc.textureGlowLocation = new ResourceLocation(npc.display.glowTexture);
+			} else {
+				String locationString = npc.textureGlowLocation.getResourceDomain() + ":" + npc.textureGlowLocation.getResourcePath();
+				if (!locationString.equals(npc.display.glowTexture)) {
+					npc.textureGlowLocation = new ResourceLocation(npc.display.glowTexture);
+				}
 			}
+
 			bindTexture((ResourceLocation) npc.textureGlowLocation);
 			float f1 = 1.0F;
 
@@ -259,6 +265,11 @@ public class RenderNPCInterface extends RenderLiving{
 		{
 			if(npc.texturePoweredLocation == null){
 				npc.texturePoweredLocation = new ResourceLocation(npc.display.poweredTexture);
+			} else {
+				String locationString = npc.texturePoweredLocation.getResourceDomain() + ":" + npc.texturePoweredLocation.getResourcePath();
+				if (!locationString.equals(npc.display.poweredTexture)) {
+					npc.texturePoweredLocation = new ResourceLocation(npc.display.poweredTexture);
+				}
 			}
 
 			bindTexture((ResourceLocation) npc.texturePoweredLocation);
diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java
index d9e85f426..58f416ad2 100644
--- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java
+++ b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java
@@ -1096,40 +1096,36 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 
 	public void setOverlayTexture(String overlayTexture) {
 		npc.display.glowTexture = overlayTexture;
-		npc.updateClient = true;
+		npc.script.clientNeedsUpdate = true;
 	}
 	public String getOverlayTexture() {return npc.display.glowTexture;}
 
 	public void setOverlaySize(float size) {
 		npc.display.overlaySize = size;
-		npc.updateClient = true;
 	}
 	public float getOverlaySize() {return npc.display.overlaySize;}
 
 	public void setOverlayScale(float scaleX, float scaleY) {
 		npc.display.overlayScaleX = scaleX;
 		npc.display.overlayScaleY = scaleY;
-		npc.updateClient = true;
 	}
 	public float getOverlayTextureScaleX() {return npc.display.overlayScaleX;}
 	public float getOverlayTextureScaleY() {return npc.display.overlayScaleY;}
 
 	public void setPoweredTexture(String poweredTexture) {
 		npc.display.poweredTexture = poweredTexture;
-		npc.updateClient = true;
+		npc.script.clientNeedsUpdate = true;
 	}
 	public String getPoweredTexture() {return npc.display.poweredTexture;}
 
 	public void setPoweredSize(float size) {
 		npc.display.poweredSize = size;
-		npc.updateClient = true;
 	}
 	public float getPoweredSize() {return npc.display.poweredSize;}
 
 	public void setPoweredScale(float scaleX, float scaleY) {
 		npc.display.poweredScaleX = scaleX;
 		npc.display.poweredScaleY = scaleY;
-		npc.updateClient = true;
 	}
 	public float getPoweredTextureScaleX() {return npc.display.poweredScaleX;}
 	public float getPoweredTextureScaleY() {return npc.display.poweredScaleY;}
@@ -1137,7 +1133,6 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
 	public void setPoweredSpeed(float speedX, float speedY) {
 		npc.display.poweredSpeedX = speedX;
 		npc.display.poweredSpeedY = speedY;
-		npc.updateClient = true;
 	}
 	public float getPoweredSpeedX() {return npc.display.poweredSpeedX;}
 	public float getPoweredSpeedY() {return npc.display.poweredSpeedY;}