From b6f4aec45c2a7f2e74ca066f760fad5b7ad10a33 Mon Sep 17 00:00:00 2001 From: Buuz135 Date: Sun, 17 Oct 2021 19:59:59 +0200 Subject: [PATCH] Adressed PR comments --- .../apiimpl/network/node/cover/CoverManager.java | 6 +++--- .../refinedstorage/render/model/CubeBuilder.java | 2 +- .../com/refinedmods/refinedstorage/util/RenderUtils.java | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java index d426f5ccd..d7cd93b8d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java @@ -164,8 +164,8 @@ public class CoverManager { } @Nullable - public static Block getBlock(@Nullable ItemStack item) { - if (item == null) { + public static Block getBlock(ItemStack item) { + if (item.isEmpty()) { return null; } @@ -180,7 +180,7 @@ public class CoverManager { @Nullable @SuppressWarnings("deprecation") - public static BlockState getBlockState(@Nullable ItemStack item) { + public static BlockState getBlockState(ItemStack item) { Block block = getBlock(item); if (block == null) { diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/CubeBuilder.java b/src/main/java/com/refinedmods/refinedstorage/render/model/CubeBuilder.java index ab87a0d31..feb54adb5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/CubeBuilder.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/CubeBuilder.java @@ -111,7 +111,7 @@ public class CubeBuilder { } private BakedQuad bakeFace(Direction facing, Face cubeFace) { - BakedQuadBuilder builder = new BakedQuadBuilder(cubeFace.sprite); //TODO See if can change the vertex format + BakedQuadBuilder builder = new BakedQuadBuilder(cubeFace.sprite); builder.setQuadOrientation(facing); builder.setQuadTint(-1); diff --git a/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java index ee83d8f95..810538550 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java @@ -373,7 +373,9 @@ public final class RenderUtils { } if (sprite == null) { - sprite = null; //TODO Get missing sprite + for (BakedQuad quad : Minecraft.getInstance().getModelManager().getMissingModel().getQuads(coverState, facing, rand)) { + return quad.getSprite(); + } } return sprite;