Fix stuff and things pt 2

This commit is contained in:
Raoul Van den Berge
2016-10-30 20:15:31 +01:00
parent 8c6fd81d18
commit d4404e0d74
10 changed files with 14 additions and 14 deletions

View File

@@ -182,7 +182,7 @@ public final class RSUtils {
} }
public static AccessType readAccessType(NBTTagCompound tag) { public static AccessType readAccessType(NBTTagCompound tag) {
return tag.hasKey(NBT_ACCESS_TYPE) ? getAccessType(tag.getInteger(NBT_ACCESS_TYPE)) : AccessType.EXTRACT_INSERT; return tag.hasKey(NBT_ACCESS_TYPE) ? getAccessType(tag.getInteger(NBT_ACCESS_TYPE)) : AccessType.INSERT_EXTRACT;
} }
public static AccessType getAccessType(int id) { public static AccessType getAccessType(int id) {
@@ -192,7 +192,7 @@ public final class RSUtils {
} }
} }
return AccessType.EXTRACT_INSERT; return AccessType.INSERT_EXTRACT;
} }
public static IItemHandler getItemHandler(TileEntity tile, EnumFacing side) { public static IItemHandler getItemHandler(TileEntity tile, EnumFacing side) {

View File

@@ -5,9 +5,9 @@ package com.raoulvdberge.refinedstorage.api.storage;
*/ */
public enum AccessType { public enum AccessType {
/** /**
* Extract and insert ability. * Insert and extract ability.
*/ */
EXTRACT_INSERT(0), INSERT_EXTRACT(0),
/** /**
* Only extract ability. * Only extract ability.
*/ */

View File

@@ -22,6 +22,6 @@ public interface IStorage<T> {
* @return the access type of this storage * @return the access type of this storage
*/ */
default AccessType getAccessType() { default AccessType getAccessType() {
return AccessType.EXTRACT_INSERT; return AccessType.INSERT_EXTRACT;
} }
} }

View File

@@ -520,7 +520,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
} }
int orginalSize = size; int orginalSize = size;
AccessType accessType = AccessType.EXTRACT_INSERT; AccessType accessType = AccessType.INSERT_EXTRACT;
ItemStack remainder = stack; ItemStack remainder = stack;
for (IItemStorage storage : this.itemStorage.getStorages()) { for (IItemStorage storage : this.itemStorage.getStorages()) {
@@ -620,7 +620,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
} }
int orginalSize = size; int orginalSize = size;
AccessType accessType = AccessType.EXTRACT_INSERT; AccessType accessType = AccessType.INSERT_EXTRACT;
FluidStack remainder = stack; FluidStack remainder = stack;
for (IFluidStorage storage : this.fluidStorage.getStorages()) { for (IFluidStorage storage : this.fluidStorage.getStorages()) {

View File

@@ -185,7 +185,7 @@ public class TileDiskDrive extends TileNode implements IItemStorageProvider, IFl
private ItemStorage itemStorages[] = new ItemStorage[8]; private ItemStorage itemStorages[] = new ItemStorage[8];
private FluidStorage fluidStorages[] = new FluidStorage[8]; private FluidStorage fluidStorages[] = new FluidStorage[8];
private AccessType accessType = AccessType.EXTRACT_INSERT; private AccessType accessType = AccessType.INSERT_EXTRACT;
private int priority = 0; private int priority = 0;
private int compare = IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE; private int compare = IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE;
private int mode = IFilterable.WHITELIST; private int mode = IFilterable.WHITELIST;

View File

@@ -81,7 +81,7 @@ public class TileFluidStorage extends TileNode implements IFluidStorageProvider,
private EnumFluidStorageType type; private EnumFluidStorageType type;
private AccessType accessType = AccessType.EXTRACT_INSERT; private AccessType accessType = AccessType.INSERT_EXTRACT;
private int priority = 0; private int priority = 0;
private int compare = IComparer.COMPARE_NBT; private int compare = IComparer.COMPARE_NBT;
private int mode = IFilterable.WHITELIST; private int mode = IFilterable.WHITELIST;

View File

@@ -82,7 +82,7 @@ public class TileStorage extends TileNode implements IItemStorageProvider, IStor
private EnumItemStorageType type; private EnumItemStorageType type;
private AccessType accessType = AccessType.EXTRACT_INSERT; private AccessType accessType = AccessType.INSERT_EXTRACT;
private int priority = 0; private int priority = 0;
private int compare = IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE; private int compare = IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE;
private int mode = IFilterable.WHITELIST; private int mode = IFilterable.WHITELIST;

View File

@@ -9,7 +9,7 @@ import net.minecraft.tileentity.TileEntity;
public interface IAccessType { public interface IAccessType {
static <T extends TileEntity & IAccessType> TileDataParameter<AccessType> createParameter() { static <T extends TileEntity & IAccessType> TileDataParameter<AccessType> createParameter() {
return new TileDataParameter<>(RSSerializers.ACCESS_TYPE_SERIALIZER, AccessType.EXTRACT_INSERT, new ITileDataProducer<AccessType, T>() { return new TileDataParameter<>(RSSerializers.ACCESS_TYPE_SERIALIZER, AccessType.INSERT_EXTRACT, new ITileDataProducer<AccessType, T>() {
@Override @Override
public AccessType getValue(T tile) { public AccessType getValue(T tile) {
return tile.getAccessType(); return tile.getAccessType();

View File

@@ -13,7 +13,7 @@ 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.EXTRACT_INSERT; private AccessType lockedAccessType = AccessType.INSERT_EXTRACT;
public ItemStorageItemHandler(TileExternalStorage externalStorage, IItemHandler handler) { public ItemStorageItemHandler(TileExternalStorage externalStorage, IItemHandler handler) {
this.externalStorage = externalStorage; this.externalStorage = externalStorage;
@@ -100,6 +100,6 @@ public class ItemStorageItemHandler extends ItemStorageExternal {
@Override @Override
public AccessType getAccessType() { public AccessType getAccessType() {
return ((lockedAccessType != AccessType.EXTRACT_INSERT) ? lockedAccessType : externalStorage.getAccessType()); return ((lockedAccessType != AccessType.INSERT_EXTRACT) ? lockedAccessType : externalStorage.getAccessType());
} }
} }

View File

@@ -83,7 +83,7 @@ public class TileExternalStorage extends TileMultipartNode implements IItemStora
private int compare = IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE; private int compare = IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE;
private int mode = IFilterable.WHITELIST; private int mode = IFilterable.WHITELIST;
private int type = IType.ITEMS; private int type = IType.ITEMS;
private AccessType accessType = AccessType.EXTRACT_INSERT; private AccessType accessType = AccessType.INSERT_EXTRACT;
private List<ItemStorageExternal> itemStorages = new ArrayList<>(); private List<ItemStorageExternal> itemStorages = new ArrayList<>();
private List<FluidStorageExternal> fluidStorages = new ArrayList<>(); private List<FluidStorageExternal> fluidStorages = new ArrayList<>();