Improved exceptions
Many exceptions got an improvement due to changed class or description or details it is providing. Is not complete, needs to be done in patches in the regions, where it is needed, since some are just swallowed. Removed total usage of pure RuntimeExceptions to 0.
This commit is contained in:
@@ -25,37 +25,38 @@ import appeng.api.storage.data.IAEItemStack;
|
||||
import appeng.tile.inventory.AppEngInternalAEInventory;
|
||||
|
||||
|
||||
public class AEInvIterator implements Iterator<IAEItemStack>
|
||||
public final class AEInvIterator implements Iterator<IAEItemStack>
|
||||
{
|
||||
private final AppEngInternalAEInventory inventory;
|
||||
private final int size;
|
||||
|
||||
final AppEngInternalAEInventory inv;
|
||||
final int size;
|
||||
private int counter = 0;
|
||||
|
||||
int x = 0;
|
||||
|
||||
public AEInvIterator( AppEngInternalAEInventory i )
|
||||
public AEInvIterator( AppEngInternalAEInventory inventory )
|
||||
{
|
||||
this.inv = i;
|
||||
this.size = this.inv.getSizeInventory();
|
||||
this.inventory = inventory;
|
||||
this.size = this.inventory.getSizeInventory();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasNext()
|
||||
{
|
||||
return this.x < this.size;
|
||||
return this.counter < this.size;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IAEItemStack next()
|
||||
{
|
||||
IAEItemStack result = this.inv.getAEStackInSlot( this.x );
|
||||
this.x++;
|
||||
final IAEItemStack result = this.inventory.getAEStackInSlot( this.counter );
|
||||
|
||||
this.counter++;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void remove()
|
||||
{
|
||||
throw new RuntimeException( "no..." );
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,11 +22,11 @@ package appeng.util.iterators;
|
||||
import java.util.Iterator;
|
||||
|
||||
|
||||
public class ChainedIterator<T> implements Iterator<T>
|
||||
public final class ChainedIterator<T> implements Iterator<T>
|
||||
{
|
||||
private final T[] list;
|
||||
|
||||
final T[] list;
|
||||
int offset = 0;
|
||||
private int offset = 0;
|
||||
|
||||
public ChainedIterator( T... list )
|
||||
{
|
||||
@@ -50,6 +50,6 @@ public class ChainedIterator<T> implements Iterator<T>
|
||||
@Override
|
||||
public void remove()
|
||||
{
|
||||
throw new RuntimeException( "Not implemented." );
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,37 +25,37 @@ import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
|
||||
public class InvIterator implements Iterator<ItemStack>
|
||||
public final class InvIterator implements Iterator<ItemStack>
|
||||
{
|
||||
private final IInventory inventory;
|
||||
private final int size;
|
||||
|
||||
final IInventory inv;
|
||||
final int size;
|
||||
private int counter = 0;
|
||||
|
||||
int x = 0;
|
||||
|
||||
public InvIterator( IInventory i )
|
||||
public InvIterator( IInventory inventory )
|
||||
{
|
||||
this.inv = i;
|
||||
this.size = this.inv.getSizeInventory();
|
||||
this.inventory = inventory;
|
||||
this.size = this.inventory.getSizeInventory();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasNext()
|
||||
{
|
||||
return this.x < this.size;
|
||||
return this.counter < this.size;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack next()
|
||||
{
|
||||
ItemStack result = this.inv.getStackInSlot( this.x );
|
||||
this.x++;
|
||||
ItemStack result = this.inventory.getStackInSlot( this.counter );
|
||||
this.counter++;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void remove()
|
||||
{
|
||||
throw new RuntimeException( "no..." );
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,10 +27,9 @@ import appeng.api.networking.IGridHost;
|
||||
import appeng.api.networking.IGridNode;
|
||||
|
||||
|
||||
public class ProxyNodeIterator implements Iterator<IGridNode>
|
||||
public final class ProxyNodeIterator implements Iterator<IGridNode>
|
||||
{
|
||||
|
||||
final Iterator<IGridHost> hosts;
|
||||
private final Iterator<IGridHost> hosts;
|
||||
|
||||
public ProxyNodeIterator( Iterator<IGridHost> hosts )
|
||||
{
|
||||
@@ -53,6 +52,6 @@ public class ProxyNodeIterator implements Iterator<IGridNode>
|
||||
@Override
|
||||
public void remove()
|
||||
{
|
||||
throw new RuntimeException( "Not implemented." );
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user