aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-02-02 01:50:38 +0900
committerGitHub <noreply@github.com>2023-02-01 17:50:38 +0100
commit4de849a3cd3f65d8d905a452b37009f09c01c620 (patch)
treee1dd7ff5f17dfca839c19a9fa1fbd0a70d06452e /src/main/java/gregtech/common
parent084faa7bad8c0c08c7a04fdf1f67cd27f6d242fc (diff)
downloadGT5-Unofficial-4de849a3cd3f65d8d905a452b37009f09c01c620.tar.gz
GT5-Unofficial-4de849a3cd3f65d8d905a452b37009f09c01c620.tar.bz2
GT5-Unofficial-4de849a3cd3f65d8d905a452b37009f09c01c620.zip
Fix crash with rendering GT_MetaGenerated_Item_99 item (#1710)
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/render/items/GT_MetaGenerated_Item_Renderer.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/main/java/gregtech/common/render/items/GT_MetaGenerated_Item_Renderer.java b/src/main/java/gregtech/common/render/items/GT_MetaGenerated_Item_Renderer.java
index 49b5521485..b255fbab9c 100644
--- a/src/main/java/gregtech/common/render/items/GT_MetaGenerated_Item_Renderer.java
+++ b/src/main/java/gregtech/common/render/items/GT_MetaGenerated_Item_Renderer.java
@@ -2,8 +2,6 @@ package gregtech.common.render.items;
import static gregtech.api.util.GT_OreDictUnificator.getAssociation;
-import java.util.Objects;
-
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.IItemRenderer;
@@ -13,6 +11,7 @@ import org.lwjgl.opengl.GL11;
import gregtech.api.enums.Materials;
import gregtech.api.items.GT_MetaGenerated_Item;
+import gregtech.api.objects.ItemData;
import gregtech.api.util.GT_Utility;
public class GT_MetaGenerated_Item_Renderer implements IItemRenderer {
@@ -67,9 +66,12 @@ public class GT_MetaGenerated_Item_Renderer implements IItemRenderer {
// Handle fluid rendering.
if (aMaterialRenderer == null) {
- Materials material = Objects.requireNonNull(getAssociation(aStack)).mMaterial.mMaterial;
- if (material.renderer != null) {
- aMaterialRenderer = material.renderer;
+ ItemData itemData = getAssociation(aStack);
+ if (itemData != null) {
+ Materials material = itemData.mMaterial.mMaterial;
+ if (material.renderer != null) {
+ aMaterialRenderer = material.renderer;
+ }
}
}