Make redstone reader/writer work again

This commit is contained in:
Raoul Van den Berge
2016-11-12 17:57:30 +01:00
parent 39d5e8fce5
commit d4ca8610a0
3 changed files with 20 additions and 2 deletions

View File

@@ -4,6 +4,7 @@ import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.RSBlocks;
import com.raoulvdberge.refinedstorage.RSGui; import com.raoulvdberge.refinedstorage.RSGui;
import com.raoulvdberge.refinedstorage.tile.TileReader; import com.raoulvdberge.refinedstorage.tile.TileReader;
import mcmultipart.microblock.MicroblockContainer;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@@ -12,6 +13,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.List; import java.util.List;
@@ -37,6 +39,11 @@ public class BlockReader extends BlockCable {
return true; return true;
} }
@Override
public boolean canConnectRedstoneDefault(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side, MicroblockContainer partContainer) {
return side == ((TileReader) world.getTileEntity(pos)).getDirection().getOpposite();
}
@Override @Override
public TileEntity createTileEntity(World world, IBlockState state) { public TileEntity createTileEntity(World world, IBlockState state) {
return new TileReader(); return new TileReader();

View File

@@ -3,6 +3,7 @@ package com.raoulvdberge.refinedstorage.block;
import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.RSBlocks;
import com.raoulvdberge.refinedstorage.RSGui; import com.raoulvdberge.refinedstorage.RSGui;
import com.raoulvdberge.refinedstorage.tile.TileReader;
import com.raoulvdberge.refinedstorage.tile.TileWriter; import com.raoulvdberge.refinedstorage.tile.TileWriter;
import mcmultipart.microblock.MicroblockContainer; import mcmultipart.microblock.MicroblockContainer;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
@@ -55,7 +56,17 @@ public class BlockWriter extends BlockCable {
@Override @Override
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public int getStrongPowerDefault(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side, MicroblockContainer partContainer) { public int getStrongPowerDefault(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side, MicroblockContainer partContainer) {
return getWeakPower(state, world, pos, side); return getWeakPowerDefault(state, world, pos, side, partContainer);
}
@Override
public boolean canProvidePower(IBlockState state) {
return true;
}
@Override
public boolean canConnectRedstoneDefault(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side, MicroblockContainer partContainer) {
return side == ((TileWriter) world.getTileEntity(pos)).getDirection().getOpposite();
} }
@Override @Override

View File

@@ -60,7 +60,7 @@ public class TileReader extends TileMultipartNode implements IReader {
@Override @Override
public int getRedstoneStrength() { public int getRedstoneStrength() {
return worldObj.getRedstonePower(pos, getDirection().getOpposite()); return worldObj.getRedstonePower(pos.offset(getDirection()), getDirection());
} }
@Override @Override