mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-18 14:15:12 +00:00
Code Issues Releases Wiki Activity

Replace WorldUtil methods with builtin alternatives

Browse Source 
- Replace most 0 <= y < world.getHeight() checks with
  world.isBlockValid.
 - Remove several "in bounds" checks, as they'll be handled by later
   calls.
This commit is contained in:
SquidDev
2018-12-26 10:28:32 +00:00
parent a1c4a9fb58
commit 4d5c52bc63
14 changed files with 121 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/dan200/computercraft/ComputerCraft.java
View File

@@ -61,7 +61,6 @@ import dan200.computercraft.shared.turtle.upgrades.*;
import dan200.computercraft.shared.util.CreativeTabMain;
import dan200.computercraft.shared.util.IDAssigner;
import dan200.computercraft.shared.util.InventoryUtil;
import dan200.computercraft.shared.util.WorldUtil;
import dan200.computercraft.shared.wired.CapabilityWiredElement;
import dan200.computercraft.shared.wired.WiredNode;
import io.netty.buffer.Unpooled;
@@ -778,20 +777,12 @@ public class ComputerCraft
public static int getDefaultBundledRedstoneOutput( World world, BlockPos pos, EnumFacing side )
{
if( WorldUtil.isBlockInWorld( world, pos ) )
{
return DefaultBundledRedstoneProvider.getDefaultBundledRedstoneOutput( world, pos, side );
}
return -1;
return world.isValid( pos ) ? DefaultBundledRedstoneProvider.getDefaultBundledRedstoneOutput( world, pos, side ) : -1;
}
public static int getBundledRedstoneOutput( World world, BlockPos pos, EnumFacing side )
{
int y = pos.getY();
if( y < 0 || y >= world.getHeight() )
{
return -1;
}
if( !world.isValid( pos ) ) return -1;
// Try the handlers in order:
int combinedSignal = -1;