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

this access

Browse Source
This commit is contained in:
thatsIch
2015-03-26 11:01:57 +01:00
parent 7f7c71a22e
commit 3143c871d0
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/integration/modules/helpers/BSCrateStorageAdaptor.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
{ {
ItemStack f = Platform.cloneItemStack( target ); ItemStack f = Platform.cloneItemStack( target );
f.stackSize = amount; f.stackSize = amount;
return cs.extractItems( f, amount ); return this.cs.extractItems( f, amount );
} }
return null; return null;
src/main/java/appeng/me/storage/MEInventoryHandler.java
+3 -3
View File
@@ -122,7 +122,7 @@ public class MEInventoryHandler<T extends IAEStack<T>> implements IMEInventoryHa
@Override @Override
public T extractItems( T request, Actionable type, BaseActionSource src ) public T extractItems( T request, Actionable type, BaseActionSource src )
{ {
if ( !hasReadAccess ) if ( !this.hasReadAccess )
return null; return null;
return this.internal.extractItems( request, type, src ); return this.internal.extractItems( request, type, src );
@@ -131,7 +131,7 @@ public class MEInventoryHandler<T extends IAEStack<T>> implements IMEInventoryHa
@Override @Override
public IItemList<T> getAvailableItems( IItemList<T> out ) public IItemList<T> getAvailableItems( IItemList<T> out )
{ {
if ( !hasReadAccess ) if ( !this.hasReadAccess )
return out; return out;
return this.internal.getAvailableItems( out ); return this.internal.getAvailableItems( out );
@@ -160,7 +160,7 @@ public class MEInventoryHandler<T extends IAEStack<T>> implements IMEInventoryHa
@Override @Override
public boolean canAccept( T input ) public boolean canAccept( T input )
{ {
if ( !hasWriteAccess ) if ( !this.hasWriteAccess )
return false; return false;
if ( this.myWhitelist == IncludeExclude.BLACKLIST && this.myPartitionList.isListed( input ) ) if ( this.myWhitelist == IncludeExclude.BLACKLIST && this.myPartitionList.isListed( input ) )
src/main/java/appeng/util/item/OreHelper.java
+6 -6
View File
@@ -82,7 +82,7 @@ public class OreHelper
continue; continue;
} }
for ( ItemStack oreItem : oreDictCache.getUnchecked( ore ) ) for ( ItemStack oreItem : this.oreDictCache.getUnchecked( ore ) )
{ {
if ( OreDictionary.itemMatches( oreItem, ItemStack, false ) ) if ( OreDictionary.itemMatches( oreItem, ItemStack, false ) )
{ {
@@ -141,7 +141,7 @@ public class OreHelper
for ( String oreName : a.getEquivalents() ) for ( String oreName : a.getEquivalents() )
{ {
for ( ItemStack oreItem : oreDictCache.getUnchecked( oreName ) ) for ( ItemStack oreItem : this.oreDictCache.getUnchecked( oreName ) )
{ {
if ( OreDictionary.itemMatches( oreItem, o, false ) ) if ( OreDictionary.itemMatches( oreItem, o, false ) )
return true; return true;
@@ -153,7 +153,7 @@ public class OreHelper
public List<ItemStack> getCachedOres( String oreName ) public List<ItemStack> getCachedOres( String oreName )
{ {
return oreDictCache.getUnchecked( oreName ); return this.oreDictCache.getUnchecked( oreName );
} }
private static class ItemRef private static class ItemRef
@@ -196,9 +196,9 @@ public class OreHelper
public String toString() public String toString()
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.append( "ItemRef [ref=" ).append( ref.getUnlocalizedName() ) builder.append( "ItemRef [ref=" ).append( this.ref.getUnlocalizedName() )
.append( ", damage=" ).append( damage ).append( ", hash=" ) .append( ", damage=" ).append( this.damage ).append( ", hash=" )
.append( hash ).append( "]" ); .append( this.hash ).append( "]" );
return builder.toString(); return builder.toString();
} }