From dfc8f48f120a215176926f98bd745a9fd65ea7fe Mon Sep 17 00:00:00 2001 From: Jacob Farley Date: Fri, 4 Sep 2020 20:08:53 -0500 Subject: [PATCH] Disable TurtleTool rendering temporarily. --- .../computercraft/client/render/TurtleSmartItemModel.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/dan200/computercraft/client/render/TurtleSmartItemModel.java b/src/main/java/dan200/computercraft/client/render/TurtleSmartItemModel.java index 5b5be7df9..0c5829f17 100644 --- a/src/main/java/dan200/computercraft/client/render/TurtleSmartItemModel.java +++ b/src/main/java/dan200/computercraft/client/render/TurtleSmartItemModel.java @@ -18,6 +18,7 @@ import dan200.computercraft.api.client.TransformedModel; import dan200.computercraft.api.turtle.ITurtleUpgrade; import dan200.computercraft.api.turtle.TurtleSide; import dan200.computercraft.shared.turtle.items.ItemTurtle; +import dan200.computercraft.shared.turtle.upgrades.TurtleTool; import dan200.computercraft.shared.util.Holiday; import dan200.computercraft.shared.util.HolidayUtil; @@ -76,7 +77,8 @@ public class TurtleSmartItemModel implements BakedModel { boolean christmas = HolidayUtil.getCurrentHoliday() == Holiday.CHRISTMAS; String label = turtle.getLabel(stack); boolean flip = label != null && (label.equals("Dinnerbone") || label.equals("Grumm")); - TurtleModelCombination combo = new TurtleModelCombination(colour != -1, leftUpgrade, rightUpgrade, overlay, christmas, flip); + // TODO Make TurtleTool render for turtle items again. + TurtleModelCombination combo = new TurtleModelCombination(colour != -1, !(leftUpgrade instanceof TurtleTool) ? leftUpgrade : null, !(rightUpgrade instanceof TurtleTool) ? rightUpgrade : null, overlay, christmas, flip); BakedModel model = TurtleSmartItemModel.this.m_cachedModels.get(combo); if (model == null) {