fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reworked how changes are propagated in the network

Browse Source
This commit is contained in:
Salomão
2021-07-16 14:13:48 -03:00
parent f9c274fb48
commit 24750f00b1
20 changed files with 591 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/storage/TileChest.java
+6 -12
View File
@@ -554,14 +554,10 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
@Override
public List<IMEInventoryHandler> getCellArray( final IStorageChannel channel )
{
if( this.getProxy().isActive() )
this.updateHandler();
if( this.cellHandler != null && this.cellHandler.getChannel() == channel )
{
this.updateHandler();
if( this.cellHandler != null && this.cellHandler.getChannel() == channel )
{
return Collections.singletonList( this.cellHandler );
}
return Collections.singletonList( this.cellHandler );
}
return Collections.emptyList();
}
@@ -692,7 +688,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
@Override
public void postChange( final IBaseMonitor<T> monitor, final Iterable<T> change, final IActionSource source )
{
if( source == TileChest.this.mySrc || source.machine().map( machine -> machine == TileChest.this ).orElse( false ) )
if( TileChest.this.mySrc == source || TileChest.this.mySrc.machine().map( machine -> machine == TileChest.this ).orElse( false ) )
{
try
{
@@ -700,14 +696,12 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
{
TileChest.this.getProxy().getStorage().postAlterationOfStoredItems( this.chan, change, TileChest.this.mySrc );
}
}
catch( final GridAccessException e )
} catch ( final GridAccessException e )
{
// :(
}
TileChest.this.blinkCell( 0 );
}
TileChest.this.blinkCell( 0 );
}
@Override
src/main/java/appeng/tile/storage/TileDrive.java
+2 -7
View File
@@ -334,13 +334,8 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
@Override
public List<IMEInventoryHandler> getCellArray( final IStorageChannel channel )
{
if( this.getProxy().isActive() )
{
this.updateState();
return this.inventoryHandlers.get( channel );
}
return Collections.emptyList();
this.updateState();
return this.inventoryHandlers.get( channel );
}
@Override