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

Added functions for safeguarding scripted item textures erroring.

Browse Source
This commit is contained in:
Luis C.M committed 2023-04-11 23:25:29 -05:00
1 parent 09f36bb56c
commit 116dc23f2b
2 files changed
+21 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/client/renderer/customitem/CustomItemRenderer.java
+4 -7
View File
@@ -50,7 +50,7 @@ public class CustomItemRenderer implements IItemRenderer {
ScriptCustomItem scriptCustomItem = ItemScripted.GetWrapper(itemStack);
ImageData imageData = Client.getImageData(scriptCustomItem.texture);
if(imageData.getTotalWidth() == -1 || imageData.getTotalHeight() == -1)
if(imageData.getTotalWidth() == -1 || imageData.getTotalHeight() == -1 || imageData.invalidTexture())
return;
if (type == ItemRenderType.INVENTORY) {
@@ -130,8 +130,7 @@ public class CustomItemRenderer implements IItemRenderer {
int pass = 0;
GL11.glPushMatrix();
ResourceLocation location = Client.getImageData(scriptCustomItem.texture).getLocation();
Minecraft.getMinecraft().getTextureManager().bindTexture(location);
Client.getImageData(scriptCustomItem.texture).bindTexture();
Tessellator tessellator = Tessellator.instance;
@@ -286,8 +285,7 @@ public class CustomItemRenderer implements IItemRenderer {
GL11.glDisable(GL11.GL_LIGHTING); //Forge: Make sure that render states are reset, a renderEffect can derp them up.
GL11.glEnable(GL11.GL_ALPHA_TEST);
ResourceLocation location = Client.getImageData(scriptCustomItem.texture).getLocation();
Minecraft.getMinecraft().getTextureManager().bindTexture(location);
Client.getImageData(scriptCustomItem.texture).bindTexture();
renderCustomItemSlot(0,0,16,16, itemRed, itemGreen, itemBlue);
GL11.glEnable(GL11.GL_LIGHTING);
@@ -362,8 +360,7 @@ public class CustomItemRenderer implements IItemRenderer {
TextureManager texturemanager = mc.getTextureManager();
int par3 = 0;
ResourceLocation location = Client.getImageData(scriptCustomItem.texture).getLocation();
texturemanager.bindTexture(location);
Client.getImageData(scriptCustomItem.texture).bindTexture();
Tessellator tessellator = Tessellator.instance;
IIcon icon = entityLivingBase.getItemIcon(itemStack, par3);
src/main/java/noppes/npcs/client/renderer/customitem/ImageData.java
+17
View File
@@ -18,7 +18,9 @@ public class ImageData {
private ImageDownloadAlt imageDownloadAlt = null;
private BufferedImage bufferedImage = null;
private int totalWidth, totalHeight;
private boolean gotWidthHeight;
private boolean invalid;
public ImageData(String directory) {
this.location = new ResourceLocation(directory);
@@ -32,6 +34,21 @@ public class ImageData {
}
}
public boolean invalidTexture() {
return this.invalid;
}
public void bindTexture() {
ResourceLocation location = this.getLocation();
if (location != null && !this.invalid) {
try {
Minecraft.getMinecraft().getTextureManager().bindTexture(location);
} catch (Exception exception) {
this.invalid = true;
}
}
}
public ResourceLocation getLocation() {
return this.isUrl && this.imageDownloadAlt.getBufferedImage() == null ? null : this.location;
}