Skip to content

Commit

Permalink
Fixed Broken Breaker Switch (hahaha, get it?) and updated the cahngelog
Browse files Browse the repository at this point in the history
  • Loading branch information
BluSunrize committed Nov 16, 2015
1 parent 11ea5ba commit a10bb86
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 6 deletions.
25 changes: 25 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
#####Version 0.6.2
- added wood-covered scaffolding
- added aluminium decoration blocks (fence, scaffold)
- added a creative capacitor (thanks malte0811)
- added the Vault-Tec shader
- added the redstone controlled breaker switch
- added dimension black+whitelists to the MineralMixes. Not used by IE but accessible for Minetweaker
- reworked recycling on the arc furnace, uses recipe profiling, multithreading and fancy thing (cheers, AtomicBlom)
- reworked the Excavator's Minetweaker integration. Dependent on MT 3.0.10b or later
- changed hemp->string recipe to be only a third as effective
- changed the manual on minerals, exchanged tables for proper pages for each mineral
- fixed dupe bug
- fixed NPE in eventhandler (thanks cobra)
- fixed wire offset on floodlight and lantern (thanks cobra)
- fixed ghost arms on wooden pole (thanks cobra)
- fixed Raytracing (thanks malte0811 & cobra)
- fixed broken Miló shader
- fixed light-opacity for some solid blocks
- fixed use+recipe keybinds in the NEI handler
- fixed table drawing in the manual, closes #646
- fixed getEnergyStored on machines (thanks cobra)
- fixed fluid mechanics on machines (thanks cobra)
- fixed lighting on particles


#####Version 0.6.1 - BUILT
- added sneak-hammering to change opposite side of a pump (thanks cobra)
- added config to disable GUI rescaling in the manual
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -805,12 +805,16 @@ public void onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX,
public void onNeighborBlockChange(World world, int x, int y, int z, Block neighbor)
{
TileEntity tile = world.getTileEntity(x, y, z);
if(tile instanceof TileEntityRedstoneBreaker)
if(!world.isRemote && tile instanceof TileEntityRedstoneBreaker)
{
boolean RS = !world.isBlockIndirectlyGettingPowered(x,y,z);
boolean b = ((TileEntityRedstoneBreaker)tile).active;
((TileEntityRedstoneBreaker)tile).active = world.isBlockIndirectlyGettingPowered(x,y,z);
if(b!=((TileEntityRedstoneBreaker)tile).active)
((TileEntityRedstoneBreaker)tile).active = RS;
if(b!=RS)
{
tile.markDirty();
ImmersiveNetHandler.INSTANCE.resetCachedIndirectConnections();
}
}
}

Expand Down Expand Up @@ -907,7 +911,7 @@ public void onNeighborBlockChange(World world, int x, int y, int z, Block neighb
public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int side)
{
TileEntity te = world.getTileEntity(x, y, z);
if(te instanceof TileEntityBreakerSwitch)
if(te instanceof TileEntityBreakerSwitch && !(te instanceof TileEntityRedstoneBreaker))
{
TileEntityBreakerSwitch breaker = (TileEntityBreakerSwitch)te;
boolean power = (breaker.active&&!breaker.inverted) || (!breaker.active&&breaker.inverted);
Expand All @@ -919,7 +923,7 @@ public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int sid
public int isProvidingStrongPower(IBlockAccess world, int x, int y, int z, int side)
{
TileEntity te = world.getTileEntity(x, y, z);
if(te instanceof TileEntityBreakerSwitch)
if(te instanceof TileEntityBreakerSwitch&& !(te instanceof TileEntityRedstoneBreaker))
{
TileEntityBreakerSwitch breaker = (TileEntityBreakerSwitch)te;
int powerSide = breaker.sideAttached>0?breaker.sideAttached-1:breaker.facing;
Expand All @@ -936,7 +940,7 @@ public boolean canProvidePower()
@Override
public boolean canConnectRedstone(IBlockAccess world, int x, int y, int z, int side)
{
if(world.getBlockMetadata(x, y, z)==META_breakerSwitch)
if(world.getBlockMetadata(x, y, z)==META_breakerSwitch || world.getBlockMetadata(x, y, z)==META_redstoneBreaker)
return super.canConnectRedstone(world, x, y, z, side);
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ protected boolean canTakeHV()
return true;
}

@Override
public boolean allowEnergyToPass(Connection con)
{
return !worldObj.isBlockIndirectlyGettingPowered(xCoord,yCoord,zCoord);
}

@Override
public Vec3 getRaytraceOffset(IImmersiveConnectable link)
{
Expand Down

0 comments on commit a10bb86

Please sign in to comment.