mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-06-25 22:52:51 +00:00
Code Issues Releases Wiki Activity

Replace RedstoneUtil.getRedstoneOutput with World's implementation

Browse Source 
This has just become increasingly out-of-date and inaccurate, meaning
there's no obvious reason to continue to use this over World's version.

Fixes #80
This commit is contained in:
SquidDev 2018-12-20 18:13:42 +00:00
parent 741ee447ca
commit 8b86a954ee
1 changed files with 3 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/dan200/computercraft/shared/util/RedstoneUtil.java
View File

@ -1,14 +1,12 @@
/* /*
* This file is part of ComputerCraft - http://www.computercraft.info * This file is part of ComputerCraft - http://www.computercraft.info
* Copyright Daniel Ratcliffe, 2011-2017. Do not distribute without permission. * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission.
* Send enquiries to dratcliffe@gmail.com * Send enquiries to dratcliffe@gmail.com
*/ */
package dan200.computercraft.shared.util; package dan200.computercraft.shared.util;
import dan200.computercraft.ComputerCraft; import dan200.computercraft.ComputerCraft;
import net.minecraft.block.Block;
import net.minecraft.block.BlockRedstoneWire;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
@ -19,53 +17,13 @@ public class RedstoneUtil
{ {
public static int getRedstoneOutput( World world, BlockPos pos, EnumFacing side ) public static int getRedstoneOutput( World world, BlockPos pos, EnumFacing side )
{ {
int power = 0; return world.getRedstonePower( pos, side );
IBlockState state = world.getBlockState( pos );
Block block = state.getBlock();
if( block != Blocks.AIR )
{
if( block == Blocks.REDSTONE_WIRE )
{
if( side != EnumFacing.UP )
{
power = state.getValue( BlockRedstoneWire.POWER );
}
else
{
power = 0;
}
}
else if( state.canProvidePower( ) )
{
power = state.getWeakPower( world, pos, side.getOpposite() );
}
if( block.isNormalCube( state, world, pos ) )
{
for( EnumFacing testSide : EnumFacing.VALUES )
{
if( testSide != side )
{
BlockPos testPos = pos.offset( testSide );
IBlockState neighbour = world.getBlockState( testPos );
if( neighbour.canProvidePower( ) )
{
power = Math.max( power, neighbour.getStrongPower( world, testPos, testSide.getOpposite() ) );
}
}
}
}
}
return power;
} }
public static int getBundledRedstoneOutput( World world, BlockPos pos, EnumFacing side ) public static int getBundledRedstoneOutput( World world, BlockPos pos, EnumFacing side )
{ {
int signal = ComputerCraft.getBundledRedstoneOutput( world, pos, side ); int signal = ComputerCraft.getBundledRedstoneOutput( world, pos, side );
if( signal >= 0 ) return signal >= 0 ? signal : 0;
{
return signal;
}
return 0;
} }
public static void propagateRedstoneOutput( World world, BlockPos pos, EnumFacing side ) public static void propagateRedstoneOutput( World world, BlockPos pos, EnumFacing side )