From 3143c871d0ea7048c3c66a3ff18d2f4af9de5504 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Thu, 26 Mar 2015 11:01:57 +0100 Subject: [PATCH] this access --- .../modules/helpers/BSCrateStorageAdaptor.java | 2 +- .../java/appeng/me/storage/MEInventoryHandler.java | 6 +++--- src/main/java/appeng/util/item/OreHelper.java | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/appeng/integration/modules/helpers/BSCrateStorageAdaptor.java b/src/main/java/appeng/integration/modules/helpers/BSCrateStorageAdaptor.java index b95a3a28..ebc07c44 100644 --- a/src/main/java/appeng/integration/modules/helpers/BSCrateStorageAdaptor.java +++ b/src/main/java/appeng/integration/modules/helpers/BSCrateStorageAdaptor.java @@ -66,7 +66,7 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor { ItemStack f = Platform.cloneItemStack( target ); f.stackSize = amount; - return cs.extractItems( f, amount ); + return this.cs.extractItems( f, amount ); } return null; diff --git a/src/main/java/appeng/me/storage/MEInventoryHandler.java b/src/main/java/appeng/me/storage/MEInventoryHandler.java index 2108bb6a..461d855b 100644 --- a/src/main/java/appeng/me/storage/MEInventoryHandler.java +++ b/src/main/java/appeng/me/storage/MEInventoryHandler.java @@ -122,7 +122,7 @@ public class MEInventoryHandler> implements IMEInventoryHa @Override public T extractItems( T request, Actionable type, BaseActionSource src ) { - if ( !hasReadAccess ) + if ( !this.hasReadAccess ) return null; return this.internal.extractItems( request, type, src ); @@ -131,7 +131,7 @@ public class MEInventoryHandler> implements IMEInventoryHa @Override public IItemList getAvailableItems( IItemList out ) { - if ( !hasReadAccess ) + if ( !this.hasReadAccess ) return out; return this.internal.getAvailableItems( out ); @@ -160,7 +160,7 @@ public class MEInventoryHandler> implements IMEInventoryHa @Override public boolean canAccept( T input ) { - if ( !hasWriteAccess ) + if ( !this.hasWriteAccess ) return false; if ( this.myWhitelist == IncludeExclude.BLACKLIST && this.myPartitionList.isListed( input ) ) diff --git a/src/main/java/appeng/util/item/OreHelper.java b/src/main/java/appeng/util/item/OreHelper.java index 3fb61037..01f3f7d5 100644 --- a/src/main/java/appeng/util/item/OreHelper.java +++ b/src/main/java/appeng/util/item/OreHelper.java @@ -82,7 +82,7 @@ public class OreHelper continue; } - for ( ItemStack oreItem : oreDictCache.getUnchecked( ore ) ) + for ( ItemStack oreItem : this.oreDictCache.getUnchecked( ore ) ) { if ( OreDictionary.itemMatches( oreItem, ItemStack, false ) ) { @@ -141,7 +141,7 @@ public class OreHelper for ( String oreName : a.getEquivalents() ) { - for ( ItemStack oreItem : oreDictCache.getUnchecked( oreName ) ) + for ( ItemStack oreItem : this.oreDictCache.getUnchecked( oreName ) ) { if ( OreDictionary.itemMatches( oreItem, o, false ) ) return true; @@ -153,7 +153,7 @@ public class OreHelper public List getCachedOres( String oreName ) { - return oreDictCache.getUnchecked( oreName ); + return this.oreDictCache.getUnchecked( oreName ); } private static class ItemRef @@ -196,9 +196,9 @@ public class OreHelper public String toString() { StringBuilder builder = new StringBuilder(); - builder.append( "ItemRef [ref=" ).append( ref.getUnlocalizedName() ) - .append( ", damage=" ).append( damage ).append( ", hash=" ) - .append( hash ).append( "]" ); + builder.append( "ItemRef [ref=" ).append( this.ref.getUnlocalizedName() ) + .append( ", damage=" ).append( this.damage ).append( ", hash=" ) + .append( this.hash ).append( "]" ); return builder.toString(); }