From dfb7806ed466118f97a3b6b0c36260da3afec224 Mon Sep 17 00:00:00 2001 From: Darkere Date: Tue, 29 Dec 2020 10:47:11 +0100 Subject: [PATCH] fix coloring blocks without rotation fixes #2770 (#2784) --- .../refinedmods/refinedstorage/util/ColorMap.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java b/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java index 3740c781d..6e10c036f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java @@ -4,6 +4,7 @@ import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.RSBlocks; import com.refinedmods.refinedstorage.RSItems; import com.refinedmods.refinedstorage.block.BaseBlock; +import com.refinedmods.refinedstorage.block.BlockDirection; import com.refinedmods.refinedstorage.block.NetworkNodeBlock; import com.refinedmods.refinedstorage.item.blockitem.ColoredBlockItem; import net.minecraft.block.Block; @@ -111,9 +112,15 @@ public class ColorMap> { } private BlockState getNewState(RegistryObject block, BlockState state) { - return block.get().getDefaultState() - .with(NetworkNodeBlock.CONNECTED, state.get(NetworkNodeBlock.CONNECTED)) - .with(block.get().getDirection().getProperty(), state.get(block.get().getDirection().getProperty())); + if (block.get().getDirection() == BlockDirection.NONE) { + return block.get().getDefaultState() + .with(NetworkNodeBlock.CONNECTED, state.get(NetworkNodeBlock.CONNECTED)); + } else { + return block.get().getDefaultState() + .with(NetworkNodeBlock.CONNECTED, state.get(NetworkNodeBlock.CONNECTED)) + .with(block.get().getDirection().getProperty(), state.get(block.get().getDirection().getProperty())); + } + } public ActionResultType setBlockState(BlockState newState, ItemStack heldItem, World world, BlockPos pos, PlayerEntity player) {