From f1ce9a2e7b479955a0930b162ea6919da607408f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 16 Mar 2020 20:30:56 -0500 Subject: [PATCH] Fix blood pendant render crashing. Closes #3213 --- .../botania/client/core/handler/MiscellaneousIcons.java | 4 ++++ .../common/item/equipment/bauble/ItemBloodPendant.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index 8a71268df..4161697a9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -91,6 +91,8 @@ public class MiscellaneousIcons { ModelLoader.addSpecialModel(prefix("icon/goldfish")); ModelLoader.addSpecialModel(prefix("icon/phiflower")); ModelLoader.addSpecialModel(prefix("icon/nerfbat")); + ModelLoader.addSpecialModel(prefix("icon/blood_pendant_chain")); + ModelLoader.addSpecialModel(prefix("icon/blood_pendant_gem")); for (int i = 0; i < ItemKingKey.WEAPON_TYPES; i++) { ModelLoader.addSpecialModel(prefix("icon/gate_weapon_" + i)); } @@ -155,6 +157,8 @@ public class MiscellaneousIcons { goldfishModel = evt.getModelRegistry().get(prefix("icon/goldfish")); phiFlowerModel = evt.getModelRegistry().get(prefix("icon/phiflower")); nerfBatModel = evt.getModelRegistry().get(prefix("icon/nerfbat")); + bloodPendantChain = evt.getModelRegistry().get(prefix("icon/blood_pendant_chain")); + bloodPendantGem = evt.getModelRegistry().get(prefix("icon/blood_pendant_gem")); for (int i = 0; i < ItemKingKey.WEAPON_TYPES; i++) { kingKeyWeaponModels[i] = evt.getModelRegistry().get(prefix("icon/gate_weapon_" + i)); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 80421eb4c..686a34037 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -123,7 +123,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre ms.scale(0.5F, 0.5F, 0.5F); IBakedModel model = MiscellaneousIcons.INSTANCE.bloodPendantChain; - IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntitySolid()); + IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityCutout()); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV);