upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 06:07:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

ISkinOverlay:

Browse Source 
-Removed set/getLocation, only supposed to be used during rendering.
This commit is contained in:
Luis C.M committed 2022-07-02 03:23:24 -05:00
1 parent b51c47c2d4
commit 1cdc47864b
2 files changed
+7 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java
+7 -6
View File
@@ -27,6 +27,7 @@ import noppes.npcs.client.ImageDownloadAlt;
import noppes.npcs.client.model.ModelMPM;
import noppes.npcs.constants.EnumAnimation;
import noppes.npcs.constants.EnumStandingType;
import noppes.npcs.controllers.data.SkinOverlay;
import noppes.npcs.entity.EntityCustomNpc;
import noppes.npcs.entity.EntityNPCInterface;
@@ -224,20 +225,20 @@ public class RenderNPCInterface extends RenderLiving{
if (overlayData.getTexture().isEmpty())
continue;
if (overlayData.getLocation() == null) {
overlayData.setLocation(new ResourceLocation(overlayData.getTexture()));
if (((SkinOverlay)overlayData).getLocation() == null) {
((SkinOverlay)overlayData).setLocation(new ResourceLocation(overlayData.getTexture()));
} else {
String str = npc.display.skinOverlayData.overlayList.get(0).getLocation().getResourceDomain()+":"+npc.display.skinOverlayData.overlayList.get(0).getLocation().getResourcePath();
String str = ((SkinOverlay)npc.display.skinOverlayData.overlayList.get(0)).getLocation().getResourceDomain()+":"+((SkinOverlay)npc.display.skinOverlayData.overlayList.get(0)).getLocation().getResourcePath();
if (!str.equals(overlayData.getTexture())) {
overlayData.setLocation(new ResourceLocation(overlayData.getTexture()));
((SkinOverlay)overlayData).setLocation(new ResourceLocation(overlayData.getTexture()));
}
}
if (overlayData.getLocation().getResourcePath().isEmpty())
if (((SkinOverlay)overlayData).getLocation().getResourcePath().isEmpty())
continue;
try {
this.bindTexture(overlayData.getLocation());
this.bindTexture(((SkinOverlay)overlayData).getLocation());
} catch (Exception e) { continue; }
// Overlay & Glow
src/main/java/noppes/npcs/scripted/interfaces/ISkinOverlay.java
-7
View File
@@ -62,11 +62,4 @@ public interface ISkinOverlay {
float getOffsetX();
float getOffsetY();
float getOffsetZ();
/**
*
* @return The MC resource location object used to bind the overlay's texture.
*/
ResourceLocation getLocation();
void setLocation(ResourceLocation location);
}