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

Fixes #675 No disabled feature should log spam or crash anymore.

Browse Source 
Deprecates the old usage of the AEItemDefinitions via the direct method access of

* blocks()
* parts()
* items()
* materials()

and thus use the new re-direct via definitions().

All definitions are now initialized, no matter what. But SubItems, Items and Blocks are not registered, if by chance are disabled.
This commit is contained in:
thatsIch
2015-01-03 02:53:14 +01:00
parent 3dd81433ac
commit 9986ffc458
385 changed files with 12477 additions and 8292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/inventory/AppEngInternalInventory.java
+123 -123
View File
@@ -18,6 +18,7 @@
package appeng.tile.inventory;
import java.util.Iterator;
import net.minecraft.entity.player.EntityPlayer;
@@ -31,15 +32,23 @@ import appeng.me.storage.MEIInventoryWrapper;
import appeng.util.Platform;
import appeng.util.iterators.InvIterator;
public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
{
protected IAEAppEngInventory te;
protected final int size;
protected final ItemStack[] inv;
public boolean enableClientEvents = false;
protected IAEAppEngInventory te;
protected int maxStack;
public boolean enableClientEvents = false;
protected final ItemStack[] inv;
public AppEngInternalInventory( IAEAppEngInventory inventory, int size )
{
this.te = inventory;
this.size = size;
this.maxStack = 64;
this.inv = new ItemStack[size];
}
public IMEInventory getMEInventory()
{
@@ -54,31 +63,20 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
return true;
}
public AppEngInternalInventory(IAEAppEngInventory _te, int s) {
this.te = _te;
this.size = s;
this.maxStack = 64;
this.inv = new ItemStack[s];
}
protected boolean eventsEnabled()
@Override
public int getSizeInventory()
{
return Platform.isServer() || this.enableClientEvents;
}
public void setMaxStackSize(int s)
{
this.maxStack = s;
return this.size;
}
@Override
public ItemStack getStackInSlot(int var1)
public ItemStack getStackInSlot( int var1 )
{
return this.inv[var1];
}
@Override
public ItemStack decrStackSize(int slot, int qty)
public ItemStack decrStackSize( int slot, int qty )
{
if ( this.inv[slot] != null )
{
@@ -105,14 +103,19 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
return null;
}
protected boolean eventsEnabled()
{
return Platform.isServer() || this.enableClientEvents;
}
@Override
public ItemStack getStackInSlotOnClosing(int var1)
public ItemStack getStackInSlotOnClosing( int var1 )
{
return null;
}
@Override
public void setInventorySlotContents(int slot, ItemStack newItemStack)
public void setInventorySlotContents( int slot, ItemStack newItemStack )
{
ItemStack oldStack = this.inv[slot];
this.inv[slot] = newItemStack;
@@ -148,106 +151,6 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
}
}
@Override
public void markDirty()
{
if ( this.te != null && this.eventsEnabled() )
{
this.te.onChangeInventory( this, -1, InvOperation.markDirty, null, null );
}
}
// for guis...
public void markDirty(int slotIndex)
{
if ( this.te != null && this.eventsEnabled() )
{
this.te.onChangeInventory( this, slotIndex, InvOperation.markDirty, null, null );
}
}
@Override
public int getInventoryStackLimit()
{
return this.maxStack > 64 ? 64 : this.maxStack;
}
@Override
public boolean isUseableByPlayer(EntityPlayer var1)
{
return true;
}
@Override
public void closeInventory()
{
}
@Override
public void openInventory()
{
}
public void writeToNBT(NBTTagCompound target)
{
for (int x = 0; x < this.size; x++)
{
try
{
NBTTagCompound c = new NBTTagCompound();
if ( this.inv[x] != null )
{
this.inv[x].writeToNBT( c );
}
target.setTag( "#" + x, c );
}
catch (Exception ignored)
{
}
}
}
public void readFromNBT(NBTTagCompound target)
{
for (int x = 0; x < this.size; x++)
{
try
{
NBTTagCompound c = target.getCompoundTag( "#" + x );
if ( c != null )
this.inv[x] = ItemStack.loadItemStackFromNBT( c );
}
catch (Exception e)
{
AELog.error( e );
}
}
}
public void writeToNBT(NBTTagCompound data, String name)
{
NBTTagCompound c = new NBTTagCompound();
this.writeToNBT( c );
data.setTag( name, c );
}
public void readFromNBT(NBTTagCompound data, String name)
{
NBTTagCompound c = data.getCompoundTag( name );
if ( c != null )
this.readFromNBT( c );
}
@Override
public int getSizeInventory()
{
return this.size;
}
@Override
public String getInventoryName()
{
@@ -261,15 +164,112 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
}
@Override
public boolean isItemValidForSlot(int i, ItemStack itemstack)
public int getInventoryStackLimit()
{
return this.maxStack > 64 ? 64 : this.maxStack;
}
@Override
public void markDirty()
{
if ( this.te != null && this.eventsEnabled() )
{
this.te.onChangeInventory( this, -1, InvOperation.markDirty, null, null );
}
}
@Override
public boolean isUseableByPlayer( EntityPlayer var1 )
{
return true;
}
@Override
public void openInventory()
{
}
@Override
public void closeInventory()
{
}
@Override
public boolean isItemValidForSlot( int i, ItemStack itemstack )
{
return true;
}
public void setMaxStackSize( int s )
{
this.maxStack = s;
}
// for guis...
public void markDirty( int slotIndex )
{
if ( this.te != null && this.eventsEnabled() )
{
this.te.onChangeInventory( this, slotIndex, InvOperation.markDirty, null, null );
}
}
public void writeToNBT( NBTTagCompound data, String name )
{
NBTTagCompound c = new NBTTagCompound();
this.writeToNBT( c );
data.setTag( name, c );
}
public void writeToNBT( NBTTagCompound target )
{
for ( int x = 0; x < this.size; x++ )
{
try
{
NBTTagCompound c = new NBTTagCompound();
if ( this.inv[x] != null )
{
this.inv[x].writeToNBT( c );
}
target.setTag( "#" + x, c );
}
catch ( Exception ignored )
{
}
}
}
public void readFromNBT( NBTTagCompound data, String name )
{
NBTTagCompound c = data.getCompoundTag( name );
if ( c != null )
this.readFromNBT( c );
}
public void readFromNBT( NBTTagCompound target )
{
for ( int x = 0; x < this.size; x++ )
{
try
{
NBTTagCompound c = target.getCompoundTag( "#" + x );
if ( c != null )
this.inv[x] = ItemStack.loadItemStackFromNBT( c );
}
catch ( Exception e )
{
AELog.error( e );
}
}
}
@Override
public Iterator<ItemStack> iterator()
{
return new InvIterator( this );
}
}