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

When shift-clicking items into a container, and the same item is already in the target slot while its capacity is full, do not needlessly trigger an inventory change. This resets the progress of blocks like the inscriber.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-14 11:28:32 +02:00
parent 9599a31893
commit 194fa38b9f
1 changed files with 37 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/AEBaseContainer.java
+37 -52
View File
@@ -481,7 +481,7 @@ public abstract class AEBaseContainer extends Container
{
final ItemStack t = d.getStack().copy();
if( Platform.itemComparisons().isSameItem( tis, t ) ) // t.isItemEqual(tis))
if( Platform.itemComparisons().isSameItem( t, tis ) )
{
int maxSize = t.getMaxStackSize();
if( maxSize > d.getSlotStackLimit() )
@@ -489,38 +489,34 @@ public abstract class AEBaseContainer extends Container
maxSize = d.getSlotStackLimit();
}
int placeAble = maxSize - t.getCount();
int placeable = maxSize - t.getCount();
if (placeable > 0) {
if (tis.getCount() < placeable) {
placeable = tis.getCount();
}
if( tis.getCount() < placeAble )
{
placeAble = tis.getCount();
}
t.setCount(t.getCount() + placeable);
tis.setCount(tis.getCount() - placeable);
t.setCount( t.getCount() + placeAble );
tis.setCount( tis.getCount() - placeAble );
d.putStack(t);
d.putStack( t );
if (tis.getCount() <= 0) {
clickSlot.putStack(ItemStack.EMPTY);
d.onSlotChanged();
if( tis.getCount() <= 0 )
{
clickSlot.putStack( ItemStack.EMPTY );
d.onSlotChanged();
// if ( hasMETiles ) updateClient();
this.updateSlot( clickSlot );
this.updateSlot( d );
return ItemStack.EMPTY;
}
else
{
this.updateSlot( d );
this.updateSlot(clickSlot);
this.updateSlot(d);
return ItemStack.EMPTY;
} else {
this.updateSlot(d);
}
}
}
}
}
}
// FIXME figure out whats the difference between this and the one above ?!
// any match..
for( final Slot d : selectedSlots )
{
@@ -538,39 +534,32 @@ public abstract class AEBaseContainer extends Container
if( Platform.itemComparisons().isSameItem( t, tis ) )
{
int maxSize = t.getMaxStackSize();
if( d.getSlotStackLimit() < maxSize )
if( maxSize > d.getSlotStackLimit() )
{
maxSize = d.getSlotStackLimit();
}
int placeAble = maxSize - t.getCount();
int placeable = maxSize - t.getCount();
if (placeable > 0) {
if (tis.getCount() < placeable) {
placeable = tis.getCount();
}
if( tis.getCount() < placeAble )
{
placeAble = tis.getCount();
}
t.setCount(t.getCount() + placeable);
tis.setCount(tis.getCount() - placeable);
t.setCount( t.getCount() + placeAble );
tis.setCount( tis.getCount() - placeAble );
d.putStack(t);
d.putStack( t );
if (tis.getCount() <= 0) {
clickSlot.putStack(ItemStack.EMPTY);
d.onSlotChanged();
if( tis.getCount() <= 0 )
{
clickSlot.putStack( ItemStack.EMPTY );
d.onSlotChanged();
// if ( worldEntity != null )
// worldEntity.markDirty();
// if ( hasMETiles ) updateClient();
this.updateSlot( clickSlot );
this.updateSlot( d );
return ItemStack.EMPTY;
}
else
{
this.updateSlot( d );
this.updateSlot(clickSlot);
this.updateSlot(d);
return ItemStack.EMPTY;
} else {
this.updateSlot(d);
}
}
}
}
@@ -596,10 +585,6 @@ public abstract class AEBaseContainer extends Container
clickSlot.putStack( ItemStack.EMPTY );
d.onSlotChanged();
// if ( worldEntity != null )
// worldEntity.markDirty();
// if ( hasMETiles ) updateClient();
this.updateSlot( clickSlot );
this.updateSlot( d );
return ItemStack.EMPTY;