From 9d1edeaeb93c076a1cb01112559c88c0d0bbe2db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Thu, 25 Jun 2015 20:26:36 +0200 Subject: [PATCH] Ported the shift-to-toggle-state-of-3d-print-itemstacks thinger. --- .../li/cil/oc/client/renderer/block/PrintModel.scala | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/scala/li/cil/oc/client/renderer/block/PrintModel.scala b/src/main/scala/li/cil/oc/client/renderer/block/PrintModel.scala index 6bc55fcf9..c390050b2 100644 --- a/src/main/scala/li/cil/oc/client/renderer/block/PrintModel.scala +++ b/src/main/scala/li/cil/oc/client/renderer/block/PrintModel.scala @@ -2,6 +2,7 @@ package li.cil.oc.client.renderer.block import com.google.common.base.Strings import li.cil.oc.Settings +import li.cil.oc.client.KeyBindings import li.cil.oc.client.Textures import li.cil.oc.common.block import li.cil.oc.common.item.data.PrintData @@ -52,14 +53,17 @@ object PrintModel extends SmartBlockModelBase with ISmartItemModel { val faces = mutable.ArrayBuffer.empty[BakedQuad] Textures.Block.bind() - for (shape <- data.stateOff) { + val shapes = + if (data.hasActiveState && KeyBindings.showExtendedTooltips) + data.stateOn + else + data.stateOff + for (shape <- shapes) { val bounds = shape.bounds val texture = resolveTexture(shape.texture) - if (Strings.isNullOrEmpty(shape.texture)) - Tessellator.getInstance.getWorldRenderer.setColorRGBA_F(1, 1, 1, 0.25f) faces ++= bakeQuads(makeBox(bounds.min, bounds.max), Array.fill(6)(texture), shape.tint.getOrElse(NoTint)) } - if (data.stateOff.isEmpty) { + if (shapes.isEmpty) { val bounds = ExtendedAABB.unitBounds val texture = resolveTexture(Settings.resourceDomain + ":blocks/white") faces ++= bakeQuads(makeBox(bounds.min, bounds.max), Array.fill(6)(texture), Color.rgbValues(EnumDyeColor.LIME))