pick 97420a31d The big reformat of 2020

This commit is contained in:
yueh
2020-06-16 21:41:28 +02:00
parent 5304b3febe
commit 5225ea426b
2252 changed files with 95466 additions and 118582 deletions
@@ -18,7 +18,6 @@
package appeng.tile.inventory;
import java.util.Iterator;
import javax.annotation.Nonnull;
@@ -39,250 +38,197 @@ import appeng.util.item.AEItemStack;
import appeng.util.iterators.AEInvIterator;
import appeng.util.iterators.InvIterator;
public class AppEngInternalAEInventory implements IItemHandlerModifiable, Iterable<ItemStack> {
private final IAEAppEngInventory te;
private final IAEItemStack[] inv;
private final int size;
private int maxStack;
private boolean dirtyFlag = false;
public class AppEngInternalAEInventory implements IItemHandlerModifiable, Iterable<ItemStack>
{
private final IAEAppEngInventory te;
private final IAEItemStack[] inv;
private final int size;
private int maxStack;
private boolean dirtyFlag = false;
public AppEngInternalAEInventory(final IAEAppEngInventory te, final int s) {
this.te = te;
this.size = s;
this.maxStack = 64;
this.inv = new IAEItemStack[s];
}
public AppEngInternalAEInventory( final IAEAppEngInventory te, final int s )
{
this.te = te;
this.size = s;
this.maxStack = 64;
this.inv = new IAEItemStack[s];
}
public void setMaxStackSize(final int s) {
this.maxStack = s;
}
public void setMaxStackSize( final int s )
{
this.maxStack = s;
}
public IAEItemStack getAEStackInSlot(final int var1) {
return this.inv[var1];
}
public IAEItemStack getAEStackInSlot( final int var1 )
{
return this.inv[var1];
}
public void writeToNBT(final CompoundNBT data, final String name) {
final CompoundNBT c = new CompoundNBT();
this.writeToNBT(c);
data.put(name, c);
}
public void writeToNBT( final CompoundNBT data, final String name )
{
final CompoundNBT c = new CompoundNBT();
this.writeToNBT( c );
data.put( name, c );
}
private void writeToNBT(final CompoundNBT target) {
for (int x = 0; x < this.size; x++) {
try {
final CompoundNBT c = new CompoundNBT();
private void writeToNBT( final CompoundNBT target )
{
for( int x = 0; x < this.size; x++ )
{
try
{
final CompoundNBT c = new CompoundNBT();
if (this.inv[x] != null) {
this.inv[x].writeToNBT(c);
}
if( this.inv[x] != null )
{
this.inv[x].writeToNBT(c);
}
target.put("#" + x, c);
} catch (final Exception ignored) {
}
}
}
target.put( "#" + x, c );
}
catch( final Exception ignored )
{
}
}
}
public void readFromNBT(final CompoundNBT data, final String name) {
final CompoundNBT c = data.getCompound(name);
if (c != null) {
this.readFromNBT(c);
}
}
public void readFromNBT( final CompoundNBT data, final String name )
{
final CompoundNBT c = data.getCompound( name );
if( c != null )
{
this.readFromNBT( c );
}
}
private void readFromNBT(final CompoundNBT target) {
for (int x = 0; x < this.size; x++) {
try {
final CompoundNBT c = target.getCompound("#" + x);
private void readFromNBT( final CompoundNBT target )
{
for( int x = 0; x < this.size; x++ )
{
try
{
final CompoundNBT c = target.getCompound( "#" + x );
if (c != null) {
this.inv[x] = AEItemStack.fromNBT(c);
}
} catch (final Exception e) {
AELog.debug(e);
}
}
}
if( c != null )
{
this.inv[x] = AEItemStack.fromNBT( c );
}
}
catch( final Exception e )
{
AELog.debug( e );
}
}
}
protected int getStackLimit(int slot, @Nonnull ItemStack stack) {
return Math.min(this.getSlotLimit(slot), stack.getMaxStackSize());
}
protected int getStackLimit( int slot, @Nonnull ItemStack stack )
{
return Math.min( this.getSlotLimit( slot ), stack.getMaxStackSize() );
}
@Override
public int getSlots() {
return this.size;
}
@Override
public int getSlots()
{
return this.size;
}
@Override
public ItemStack getStackInSlot(final int var1) {
if (this.inv[var1] == null) {
return ItemStack.EMPTY;
}
@Override
public ItemStack getStackInSlot( final int var1 )
{
if( this.inv[var1] == null )
{
return ItemStack.EMPTY;
}
return this.inv[var1].createItemStack();
}
return this.inv[var1].createItemStack();
}
@Override
public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) {
if (stack.isEmpty()) {
return ItemStack.EMPTY;
}
@Override
public ItemStack insertItem( int slot, ItemStack stack, boolean simulate )
{
if( stack.isEmpty() )
{
return ItemStack.EMPTY;
}
ItemStack existing = this.getStackInSlot(slot);
int limit = this.getStackLimit(slot, stack);
ItemStack existing = this.getStackInSlot( slot );
int limit = this.getStackLimit( slot, stack );
if (!existing.isEmpty()) {
if (!ItemHandlerHelper.canItemStacksStack(stack, existing)) {
return stack;
}
if( !existing.isEmpty() )
{
if( !ItemHandlerHelper.canItemStacksStack( stack, existing ) )
{
return stack;
}
limit -= existing.getCount();
}
limit -= existing.getCount();
}
if (limit <= 0) {
return stack;
}
if( limit <= 0 )
{
return stack;
}
boolean reachedLimit = stack.getCount() > limit;
boolean reachedLimit = stack.getCount() > limit;
if (!simulate) {
if (existing.isEmpty()) {
this.inv[slot] = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)
.createStack(reachedLimit ? ItemHandlerHelper.copyStackWithSize(stack, limit) : stack);
} else {
existing.grow(reachedLimit ? limit : stack.getCount());
}
this.fireOnChangeInventory(slot, InvOperation.INSERT, ItemStack.EMPTY,
reachedLimit ? ItemHandlerHelper.copyStackWithSize(stack, limit) : stack);
}
return reachedLimit ? ItemHandlerHelper.copyStackWithSize(stack, stack.getCount() - limit) : ItemStack.EMPTY;
}
if( !simulate )
{
if( existing.isEmpty() )
{
this.inv[slot] = AEApi.instance()
.storage()
.getStorageChannel( IItemStorageChannel.class )
.createStack(
reachedLimit ? ItemHandlerHelper.copyStackWithSize( stack, limit ) : stack );
}
else
{
existing.grow( reachedLimit ? limit : stack.getCount() );
}
this.fireOnChangeInventory( slot, InvOperation.INSERT, ItemStack.EMPTY,
reachedLimit ? ItemHandlerHelper.copyStackWithSize( stack, limit ) : stack );
}
return reachedLimit ? ItemHandlerHelper.copyStackWithSize( stack, stack.getCount() - limit ) : ItemStack.EMPTY;
}
@Override
public ItemStack extractItem(int slot, int amount, boolean simulate) {
if (this.inv[slot] != null) {
final ItemStack split = this.getStackInSlot(slot);
@Override
public ItemStack extractItem( int slot, int amount, boolean simulate )
{
if( this.inv[slot] != null )
{
final ItemStack split = this.getStackInSlot( slot );
if (amount >= split.getCount()) {
if (!simulate) {
this.inv[slot] = null;
this.fireOnChangeInventory(slot, InvOperation.EXTRACT, split, ItemStack.EMPTY);
}
return split;
} else {
if (!simulate) {
split.grow(-amount);
this.fireOnChangeInventory(slot, InvOperation.EXTRACT,
ItemHandlerHelper.copyStackWithSize(split, amount), ItemStack.EMPTY);
}
return ItemHandlerHelper.copyStackWithSize(split, amount);
}
}
return ItemStack.EMPTY;
}
if( amount >= split.getCount() )
{
if( !simulate )
{
this.inv[slot] = null;
this.fireOnChangeInventory( slot, InvOperation.EXTRACT, split, ItemStack.EMPTY );
}
return split;
}
else
{
if( !simulate )
{
split.grow( -amount );
this.fireOnChangeInventory( slot, InvOperation.EXTRACT, ItemHandlerHelper.copyStackWithSize( split, amount ), ItemStack.EMPTY );
}
return ItemHandlerHelper.copyStackWithSize( split, amount );
}
}
return ItemStack.EMPTY;
}
@Override
public void setStackInSlot(final int slot, final ItemStack newItemStack) {
ItemStack oldStack = this.getStackInSlot(slot).copy();
this.inv[slot] = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)
.createStack(newItemStack);
@Override
public void setStackInSlot( final int slot, final ItemStack newItemStack )
{
ItemStack oldStack = this.getStackInSlot( slot ).copy();
this.inv[slot] = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( newItemStack );
if (this.te != null && Platform.isServer()) {
ItemStack newStack = newItemStack.copy();
InvOperation op = InvOperation.SET;
if( this.te != null && Platform.isServer() )
{
ItemStack newStack = newItemStack.copy();
InvOperation op = InvOperation.SET;
if (ItemStack.areItemsEqual(oldStack, newStack)) {
if (newStack.getCount() > oldStack.getCount()) {
newStack.shrink(oldStack.getCount());
oldStack = ItemStack.EMPTY;
op = InvOperation.INSERT;
} else {
oldStack.shrink(newStack.getCount());
newStack = ItemStack.EMPTY;
op = InvOperation.EXTRACT;
}
}
this.fireOnChangeInventory(slot, op, oldStack, newStack);
}
}
if( ItemStack.areItemsEqual( oldStack, newStack ) )
{
if( newStack.getCount() > oldStack.getCount() )
{
newStack.shrink( oldStack.getCount() );
oldStack = ItemStack.EMPTY;
op = InvOperation.INSERT;
}
else
{
oldStack.shrink( newStack.getCount() );
newStack = ItemStack.EMPTY;
op = InvOperation.EXTRACT;
}
}
this.fireOnChangeInventory( slot, op, oldStack, newStack );
}
}
private void fireOnChangeInventory(int slot, InvOperation op, ItemStack removed, ItemStack inserted) {
if (this.te != null && Platform.isServer() && !this.dirtyFlag) {
this.dirtyFlag = true;
this.te.onChangeInventory(this, slot, op, removed, inserted);
this.te.saveChanges();
this.dirtyFlag = false;
}
}
private void fireOnChangeInventory( int slot, InvOperation op, ItemStack removed, ItemStack inserted )
{
if( this.te != null && Platform.isServer() && !this.dirtyFlag )
{
this.dirtyFlag = true;
this.te.onChangeInventory( this, slot, op, removed, inserted );
this.te.saveChanges();
this.dirtyFlag = false;
}
}
@Override
public int getSlotLimit(int slot) {
return this.maxStack > 64 ? 64 : this.maxStack;
}
@Override
public int getSlotLimit( int slot )
{
return this.maxStack > 64 ? 64 : this.maxStack;
}
@Override
public Iterator<ItemStack> iterator() {
return new InvIterator(this);
}
@Override
public Iterator<ItemStack> iterator()
{
return new InvIterator( this );
}
public Iterator<IAEItemStack> getNewAEIterator() {
return new AEInvIterator(this);
}
public Iterator<IAEItemStack> getNewAEIterator()
{
return new AEInvIterator( this );
}
@Override
public boolean isItemValid( int slot, ItemStack stack )
{
return true;
}
@Override
public boolean isItemValid(int slot, ItemStack stack) {
return true;
}
}