dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mc1.10' into mc1.10

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-10-16 22:35:57 +02:00
parent 25017ddc62 7d4a0a9818
commit 074c11d78d
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java
View File

@@ -13,10 +13,15 @@ import java.util.List;
public class ItemStorageItemHandler extends ItemStorageExternal { public class ItemStorageItemHandler extends ItemStorageExternal {
private TileExternalStorage externalStorage; private TileExternalStorage externalStorage;
private IItemHandler handler; private IItemHandler handler;
private AccessType lockedAccessType = AccessType.READ_WRITE;
public ItemStorageItemHandler(TileExternalStorage externalStorage, IItemHandler handler) { public ItemStorageItemHandler(TileExternalStorage externalStorage, IItemHandler handler) {
this.externalStorage = externalStorage; this.externalStorage = externalStorage;
this.handler = handler; this.handler = handler;
if (externalStorage.getFacingTile().getBlockType().getUnlocalizedName().equals("tile.ExtraUtils2:TrashCan")) {
lockedAccessType = AccessType.WRITE;
}
} }
@Override @Override
@@ -97,6 +102,6 @@ public class ItemStorageItemHandler extends ItemStorageExternal {
@Override @Override
public AccessType getAccessType() { public AccessType getAccessType() {
return externalStorage.getAccessType(); return ((lockedAccessType != AccessType.READ_WRITE) ? lockedAccessType : externalStorage.getAccessType());
} }
} }

1
src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java
View File

@@ -358,7 +358,6 @@ public class TileExternalStorage extends TileMultipartNode implements IItemStora
return TYPE; return TYPE;
} }
@Override @Override
public int getType() { public int getType() {
return worldObj.isRemote ? TYPE.getValue() : type; return worldObj.isRemote ? TYPE.getValue() : type;