fix coloring blocks without rotation fixes #2770 (#2784)

This commit is contained in:
Darkere
2020-12-29 10:47:11 +01:00
committed by GitHub
parent 53a3b2cd7a
commit dfb7806ed4

View File

@@ -4,6 +4,7 @@ import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.RSBlocks; import com.refinedmods.refinedstorage.RSBlocks;
import com.refinedmods.refinedstorage.RSItems; import com.refinedmods.refinedstorage.RSItems;
import com.refinedmods.refinedstorage.block.BaseBlock; import com.refinedmods.refinedstorage.block.BaseBlock;
import com.refinedmods.refinedstorage.block.BlockDirection;
import com.refinedmods.refinedstorage.block.NetworkNodeBlock; import com.refinedmods.refinedstorage.block.NetworkNodeBlock;
import com.refinedmods.refinedstorage.item.blockitem.ColoredBlockItem; import com.refinedmods.refinedstorage.item.blockitem.ColoredBlockItem;
import net.minecraft.block.Block; import net.minecraft.block.Block;
@@ -111,9 +112,15 @@ public class ColorMap<T extends IForgeRegistryEntry<? super T>> {
} }
private <S extends BaseBlock> BlockState getNewState(RegistryObject<S> block, BlockState state) { private <S extends BaseBlock> BlockState getNewState(RegistryObject<S> block, BlockState state) {
return block.get().getDefaultState() if (block.get().getDirection() == BlockDirection.NONE) {
.with(NetworkNodeBlock.CONNECTED, state.get(NetworkNodeBlock.CONNECTED)) return block.get().getDefaultState()
.with(block.get().getDirection().getProperty(), state.get(block.get().getDirection().getProperty())); .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) { public ActionResultType setBlockState(BlockState newState, ItemStack heldItem, World world, BlockPos pos, PlayerEntity player) {