From c05b6ec04ff5d0cb08c15d0557d3d022d639db4b Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 21 Jul 2019 14:36:31 +0200 Subject: [PATCH] GregTech Community Edition items are now banned from rendering on Refined Storage patterns because they are causing crashes. Fixes #2227 --- CHANGELOG.md | 1 + .../render/model/baked/BakedModelPattern.java | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1a7bb4f1..af32336b6 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Shortened crafting text for the Russion translation to fix Grid overlays (yaroslav4167) - Fixed JEI hotkeys not working on fluid filter slots (raoulvdberge) - Fixed crash when opening Crafter Manager with FTB Quests installed (raoulvdberge) +- GregTech Community Edition items are now banned from rendering on Refined Storage patterns because they are causing crashes (raoulvdberge) ### 1.6.14 - Fixed server crash (raoulvdberge) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelPattern.java index 5946885b8..749b8b9b1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelPattern.java @@ -37,7 +37,12 @@ public class BakedModelPattern extends BakedModelDelegate { CraftingPattern pattern = ItemPattern.getPatternFromCache(world, stack); if (canDisplayOutput(stack, pattern)) { - return Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(pattern.getOutputs().get(0), world, entity); + ItemStack outputToRender = pattern.getOutputs().get(0); + + // @Volatile: Gregtech banned for rendering due to issues + if (!"gregtech".equals(outputToRender.getItem().getCreatorModId(outputToRender))) { + return Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(outputToRender, world, entity); + } } return super.handleItemState(originalModel, stack, world, entity);