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

fix export busses exporting items out of nowhere

Browse Source
This commit is contained in:
PrototypeTrousers
2022-01-31 16:51:06 -03:00
parent af1f5c34d2
commit c3a608ef59
2 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle.properties
+1 -1
View File
@@ -4,7 +4,7 @@ aebuild=7
aegroup=appeng aegroup=appeng
aebasename=appliedenergistics2 aebasename=appliedenergistics2
extended=extended_life extended=extended_life
extendedversion=v49ab extendedversion=v49ac
######################################################### #########################################################
# Versions # # Versions #
######################################################### #########################################################
src/main/java/appeng/parts/automation/PartExportBus.java
+43 -26
View File
@@ -72,7 +72,7 @@ import appeng.util.item.AEItemStack;
public class PartExportBus extends PartSharedItemBus implements ICraftingRequester public class PartExportBus extends PartSharedItemBus implements ICraftingRequester
{ {
private final int[] failedCraftTriesSlot = {0,0,0,0,0,0,0,0,0}; private final int[] failedCraftTriesSlot = {0, 0, 0, 0, 0, 0, 0, 0, 0};
public static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "part/export_bus_base" ); public static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "part/export_bus_base" );
@@ -133,10 +133,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
try try
{ {
final InventoryAdaptor destination = this.getHandler(); final InventoryAdaptor destination = this.getHandler();
final IMEMonitor<IAEItemStack> inv = this.getProxy() final IMEMonitor<IAEItemStack> inv = this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
.getStorage()
.getInventory(
AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
final IEnergyGrid energy = this.getProxy().getEnergy(); final IEnergyGrid energy = this.getProxy().getEnergy();
final ICraftingGrid cg = this.getProxy().getCrafting(); final ICraftingGrid cg = this.getProxy().getCrafting();
final FuzzyMode fzMode = (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE ); final FuzzyMode fzMode = (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE );
@@ -152,16 +149,26 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
final IAEItemStack ais = this.getConfig().getAEStackInSlot( slotToExport ); final IAEItemStack ais = this.getConfig().getAEStackInSlot( slotToExport );
if( ais == null || this.itemToSend <= 0 ) continue; if( ais == null || this.itemToSend <= 0 )
{
continue;
}
if ( this.craftOnly() ) { if( this.craftOnly() )
if (this.failedCraftTriesSlot[x] <= 0) { {
if( this.failedCraftTriesSlot[x] <= 0 )
{
this.didSomething = this.craftingTracker.handleCrafting(slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(), this.didSomething = this.craftingTracker.handleCrafting( slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(), this.getProxy().getGrid(), cg, this.mySrc ) || this.didSomething;
this.getProxy().getGrid(), cg, this.mySrc) || this.didSomething;
if (this.didSomething) this.failedCraftTriesSlot[x] = 0; if( this.didSomething )
else this.failedCraftTriesSlot[x] += 2; {
this.failedCraftTriesSlot[x] = 0;
}
else
{
this.failedCraftTriesSlot[x] += 2;
}
} }
this.failedCraftTriesSlot[x] -= 1; this.failedCraftTriesSlot[x] -= 1;
continue; continue;
@@ -190,13 +197,19 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
if( this.itemToSend == before && this.isCraftingEnabled() ) if( this.itemToSend == before && this.isCraftingEnabled() )
{ {
if (this.failedCraftTriesSlot[x] <= 0) { if( this.failedCraftTriesSlot[x] <= 0 )
{
this.didSomething = this.craftingTracker.handleCrafting(slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(), this.didSomething = this.craftingTracker.handleCrafting( slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(), this.getProxy().getGrid(), cg, this.mySrc ) || this.didSomething;
this.getProxy().getGrid(), cg, this.mySrc) || this.didSomething;
if (this.didSomething) this.failedCraftTriesSlot[x] = 0; if( this.didSomething )
else this.failedCraftTriesSlot[x] += 2; {
this.failedCraftTriesSlot[x] = 0;
}
else
{
this.failedCraftTriesSlot[x] += 2;
}
} }
this.failedCraftTriesSlot[x] -= 1; this.failedCraftTriesSlot[x] -= 1;
} }
@@ -336,11 +349,19 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
private void pushItemIntoTarget( final InventoryAdaptor d, final IEnergyGrid energy, final IMEInventory<IAEItemStack> inv, IAEItemStack ais ) private void pushItemIntoTarget( final InventoryAdaptor d, final IEnergyGrid energy, final IMEInventory<IAEItemStack> inv, IAEItemStack ais )
{ {
ItemStack inputStack = ais.createItemStack(); ItemStack inputStack = ais.getCachedItemStack( ais.getStackSize() );
ItemStack toAdd = inputStack; ItemStack remaining = d.simulateAdd( inputStack );
final ItemStack remaining = d.simulateAdd( inputStack ); // Store the stack in the cache for next time.
if( !remaining.isEmpty() )
{
ais.setCachedItemStack( remaining );
}
else
{
ais.setCachedItemStack( inputStack );
}
final long canFit = remaining.isEmpty() ? this.itemToSend : this.itemToSend - remaining.getCount(); final long canFit = remaining.isEmpty() ? this.itemToSend : this.itemToSend - remaining.getCount();
@@ -354,13 +375,9 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
{ {
this.itemToSend -= itemsToAdd.getStackSize(); this.itemToSend -= itemsToAdd.getStackSize();
if( !remaining.isEmpty() ) inputStack.setCount( Ints.saturatedCast( itemsToAdd.getStackSize() ) );
{
toAdd = remaining;
}
toAdd.setCount( Ints.saturatedCast( canFit ) );
final ItemStack failed = d.addItems( toAdd ); final ItemStack failed = d.addItems( inputStack );
if( !failed.isEmpty() ) if( !failed.isEmpty() )
{ {
ais.setStackSize( failed.getCount() ); ais.setStackSize( failed.getCount() );