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

fix looping item count and hopefully energy issues

Browse Source
This commit is contained in:
PrototypeTrousers
2021-09-26 22:06:44 -03:00
parent 517bd77df7
commit 92347ad2f5
20 changed files with 352 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/automation/PartFormationPlane.java
+2 -1
View File
@@ -187,8 +187,9 @@ public class PartFormationPlane extends PartAbstractFormationPlane<IAEItemStack>
this.stateChanged();
}
@Override
@MENetworkEventSubscribe
public void updateChannels( final MENetworkChannelsChanged changedChannels )
public void chanRender( final MENetworkChannelsChanged changedChannels )
{
this.stateChanged();
}
src/main/java/appeng/parts/automation/PartLevelEmitter.java
+13 -24
View File
@@ -184,8 +184,9 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
return flipState ? this.reportingValue >= this.lastReportedValue + 1 : this.reportingValue < this.lastReportedValue + 1;
}
@Override
@MENetworkEventSubscribe
public void powerStatusChange( final MENetworkPowerStatusChange powerEvent )
public void powerRender( final MENetworkPowerStatusChange powerEvent )
{
if (this.getProxy().isActive())
{
@@ -194,8 +195,9 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
this.updateState();
}
@Override
@MENetworkEventSubscribe
public void channelChanged( final MENetworkChannelsChanged c )
public void chanRender( final MENetworkChannelsChanged c )
{
if (this.getProxy().isActive())
{
@@ -288,37 +290,24 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
try
{
if( myStack == null )
if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 || myStack == null )
{
this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).addListener( this, this.getProxy().getGrid() );
this.getProxy()
.getStorage()
.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
.addListener( this,
this.getProxy().getGrid() );
}
else
{
this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).removeListener( this );
if( this.myWatcher != null )
{
if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
{
Optional<OreReference> ores = OreHelper.INSTANCE.getOre( myStack.getDefinition() );
if( ores.isPresent() )
{
for( IAEItemStack iaeItemStack : ores.get().getAEEquivalents() )
{
this.myWatcher.add( iaeItemStack );
}
}
else
{
this.myWatcher.add( myStack );
}
}
else
{
this.myWatcher.add( myStack );
}
this.myWatcher.add( myStack );
}
}
this.updateReportingValue( this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) );
}
catch( final GridAccessException e )
src/main/java/appeng/parts/misc/PartInterface.java
+4 -2
View File
@@ -95,14 +95,16 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
super( is );
}
@Override
@MENetworkEventSubscribe
public void stateChange( final MENetworkChannelsChanged c )
public void chanRender( final MENetworkChannelsChanged c )
{
this.duality.notifyNeighbors();
}
@Override
@MENetworkEventSubscribe
public void stateChange( final MENetworkPowerStatusChange c )
public void powerRender( final MENetworkPowerStatusChange c )
{
this.duality.notifyNeighbors();
}
src/main/java/appeng/parts/misc/PartSharedStorageBus.java
+6 -3
View File
@@ -62,6 +62,7 @@ public abstract class PartSharedStorageBus extends PartUpgradeable implements IG
private boolean wasActive = false;
private int priority = 0;
protected boolean accessChanged;
protected boolean readOncePass;
public PartSharedStorageBus( ItemStack is )
{
@@ -86,8 +87,9 @@ public abstract class PartSharedStorageBus extends PartUpgradeable implements IG
}
}
@Override
@MENetworkEventSubscribe
public void updateChannels( final MENetworkChannelsChanged changedChannels )
public void chanRender( final MENetworkChannelsChanged changedChannels )
{
this.updateStatus();
}
@@ -153,7 +155,7 @@ public abstract class PartSharedStorageBus extends PartUpgradeable implements IG
@Override
public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue )
{
if( settingName instanceof AccessRestriction )
if( settingName.name().equals( "ACCESS" ) )
{
this.accessChanged = true;
}
@@ -178,7 +180,7 @@ public abstract class PartSharedStorageBus extends PartUpgradeable implements IG
this.resetCache();
}
}
if( te == null || te instanceof TileFluidInterface )
else if( te == null || te instanceof TileFluidInterface )
{
this.resetCache( true );
this.resetCache();
@@ -195,6 +197,7 @@ public abstract class PartSharedStorageBus extends PartUpgradeable implements IG
{
super.readFromNBT( data );
this.priority = data.getInteger( "priority" );
this.accessChanged = false;
}
@Override
src/main/java/appeng/parts/misc/PartStorageBus.java
+37 -27
View File
@@ -23,9 +23,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Objects;
import appeng.fluids.parts.FluidHandlerAdapter;
import appeng.me.storage.MEPassThrough;
import appeng.parts.AEBasePart;
import appeng.tile.misc.TileInterface;
import appeng.tile.networking.TileCableBus;
import appeng.util.ConfigManager;
@@ -92,7 +89,6 @@ import appeng.me.GridAccessException;
import appeng.me.helpers.MachineSource;
import appeng.me.storage.ITickingMonitor;
import appeng.me.storage.MEInventoryHandler;
import appeng.me.storage.MEMonitorIInventory;
import appeng.parts.PartModel;
import appeng.parts.automation.PartUpgradeable;
import appeng.tile.inventory.AppEngInternalAEInventory;
@@ -128,6 +124,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
private boolean wasActive = false;
private byte resetCacheLogic = 0;
private boolean accessChanged;
private boolean readOncePass;
@Reflected
public PartStorageBus( final ItemStack is )
@@ -164,8 +161,9 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
}
}
@Override
@MENetworkEventSubscribe
public void updateChannels( final MENetworkChannelsChanged changedChannels )
public void chanRender( final MENetworkChannelsChanged changedChannels )
{
this.updateStatus();
}
@@ -179,7 +177,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
@Override
public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue )
{
if( settingName instanceof AccessRestriction )
if( settingName.name().equals( "ACCESS" ) )
{
this.accessChanged = true;
}
@@ -211,6 +209,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
super.readFromNBT( data );
this.Config.readFromNBT( data, "config" );
this.priority = data.getInteger( "priority" );
this.accessChanged = false;
}
@Override
@@ -269,24 +268,34 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
@Override
public void postChange( final IBaseMonitor<IAEItemStack> monitor, final Iterable<IAEItemStack> change, final IActionSource source )
{
if( this.mySrc.machine().map( machine -> machine == this ).orElse( false ) && monitor != null )
if( this.getProxy().isActive() )
{
AccessRestriction currentAccess = (AccessRestriction) ( (ConfigManager) this.getConfigManager() ).getSetting( Settings.ACCESS );
if( readOncePass )
{
readOncePass = false;
try
{
this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), change, source );
}
catch( final GridAccessException e )
{
// :(
}
return;
}
if( !currentAccess.hasPermission( AccessRestriction.READ ) )
{
return;
}
}
try
{
if( this.getProxy().isActive() )
try
{
this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), change, this.mySrc );
this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), change, source );
}
catch( final GridAccessException e )
{
// :(
}
}
catch( final GridAccessException e )
{
// :(
}
}
@@ -321,7 +330,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
this.resetCache();
}
}
if( te == null || te instanceof TileInterface )
else if( te == null || te instanceof TileInterface )
{
this.resetCache( true );
this.resetCache();
@@ -377,8 +386,8 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
this.resetCacheLogic = 0;
final MEInventoryHandler<IAEItemStack> in = this.getInternalHandler();
IItemList<IAEItemStack> before = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
boolean denyRead = false;
if( in != null )
{
if( accessChanged )
@@ -387,7 +396,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
AccessRestriction oldAccess = (AccessRestriction) ( (ConfigManager) this.getConfigManager() ).getOldSetting( Settings.ACCESS );
if( oldAccess.hasPermission( AccessRestriction.READ ) && !currentAccess.hasPermission( AccessRestriction.READ ) )
{
denyRead = true;
readOncePass = true;
}
in.setBaseAccess( oldAccess );
before = in.getAvailableItems( before );
@@ -408,17 +417,15 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
final MEInventoryHandler<IAEItemStack> out = this.getInternalHandler();
if( in != out || denyRead )
{
IItemList<IAEItemStack> after = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
IItemList<IAEItemStack> after = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
if( out != null && !denyRead )
if( in != out )
{
if( out != null )
{
after = out.getAvailableItems( after );
}
Platform.postListChanges( before, after, this, this.mySrc );
}
}
@@ -522,7 +529,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
if( inv instanceof ITickingMonitor )
{
this.monitor = (ITickingMonitor) inv;
this.monitor.setActionSource( new MachineSource( this ) );
this.monitor.setActionSource( mySrc );
this.monitor.setMode( (StorageFilter) this.getConfigManager().getSetting( Settings.STORAGE_FILTER ) );
}
@@ -561,7 +568,10 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
if( inv instanceof IBaseMonitor )
{
( (IBaseMonitor<IAEItemStack>) inv ).addListener( this, this.handler );
if( ( (AccessRestriction) ( (ConfigManager) this.getConfigManager() ).getSetting( Settings.ACCESS ) ).hasPermission( AccessRestriction.READ ) )
{
( (IBaseMonitor<IAEItemStack>) inv ).addListener( this, this.handler );
}
}
}
}
src/main/java/appeng/parts/reporting/AbstractPartMonitor.java
+1 -1
View File
@@ -417,7 +417,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
@Override
public void onStackChange( IItemList<?> o, IAEStack<?> fullStack, IAEStack<?> diffStack, IActionSource src, IStorageChannel<?> chan )
{
this.configuredAmount = this.configuredAmount + diffStack.getStackSize();
this.configuredAmount = fullStack.getStackSize();
if( this.configuredItem != null )
{