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

clean up crew, #817

Browse Source
This commit is contained in:
way2muchnoise
2017-01-03 20:29:15 +01:00
parent c894d94403
commit 985cf3ebd0
5 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java
View File

@@ -43,9 +43,9 @@ public interface IRSAPI {
INetworkNodeManager getNetworkNodeManager(int dimension); INetworkNodeManager getNetworkNodeManager(int dimension);
/** /**
* @return the storage disk behavior * @return the default storage disk behavior
*/ */
IStorageDiskBehavior getStorageDiskBehavior(); IStorageDiskBehavior getDefaultStorageDiskBehavior();
/** /**
* @return the solderer registry * @return the solderer registry

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java
View File

@@ -106,7 +106,7 @@ public class API implements IRSAPI {
} }
@Override @Override
public IStorageDiskBehavior getStorageDiskBehavior() { public IStorageDiskBehavior getDefaultStorageDiskBehavior() {
return storageDiskBehavior; return storageDiskBehavior;
} }

13
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java
View File

@@ -38,8 +38,8 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
private int type = IType.ITEMS; private int type = IType.ITEMS;
private int ioMode = IO_MODE_INSERT; private int ioMode = IO_MODE_INSERT;
private IStorageDisk[] itemStorages = new IStorageDisk[8]; private IStorageDisk[] itemStorages = new IStorageDisk[6];
private IStorageDisk[] fluidStorages = new IStorageDisk[8]; private IStorageDisk[] fluidStorages = new IStorageDisk[6];
private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, new ItemHandlerListenerNetworkNode(this), ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK); private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, new ItemHandlerListenerNetworkNode(this), ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK);
@@ -244,16 +244,9 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
int i = 0; int i = 0;
while (extracted == null && storage.getStacks().size() > i) { while (extracted == null && storage.getStacks().size() > i) {
FluidStack stack = storage.getStacks().get(i); FluidStack stack = storage.getStacks().get(i++);
while (stack == null && storage.getStacks().size() > i) {
i++;
}
if (stack != null) {
extracted = storage.extract(stack, upgrades.getItemInteractCount(), compare, false); extracted = storage.extract(stack, upgrades.getItemInteractCount(), compare, false);
} }
}
if (extracted == null) { if (extracted == null) {
moveDriveToOutput(slot); moveDriveToOutput(slot);

12
src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java
View File

@@ -48,13 +48,13 @@ public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvid
@Override @Override
public void getSubItems(Item item, CreativeTabs tab, NonNullList<ItemStack> subItems) { public void getSubItems(Item item, CreativeTabs tab, NonNullList<ItemStack> subItems) {
for (int i = 0; i < 5; ++i) { for (int i = 0; i < 5; ++i) {
subItems.add(API.instance().getStorageDiskBehavior().initDisk(StorageDiskType.FLUIDS, new ItemStack(item, 1, i))); subItems.add(API.instance().getDefaultStorageDiskBehavior().initDisk(StorageDiskType.FLUIDS, new ItemStack(item, 1, i)));
} }
} }
private void applyDebugDiskData(ItemStack stack) { private void applyDebugDiskData(ItemStack stack) {
if (debugDiskTag == null) { if (debugDiskTag == null) {
debugDiskTag = API.instance().getStorageDiskBehavior().getTag(StorageDiskType.FLUIDS); debugDiskTag = API.instance().getDefaultStorageDiskBehavior().getTag(StorageDiskType.FLUIDS);
StorageDiskFluid storage = new StorageDiskFluid(debugDiskTag, -1); StorageDiskFluid storage = new StorageDiskFluid(debugDiskTag, -1);
@@ -76,7 +76,7 @@ public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvid
if (stack.getMetadata() == TYPE_DEBUG) { if (stack.getMetadata() == TYPE_DEBUG) {
applyDebugDiskData(stack); applyDebugDiskData(stack);
} else { } else {
API.instance().getStorageDiskBehavior().initDisk(StorageDiskType.FLUIDS, stack); API.instance().getDefaultStorageDiskBehavior().initDisk(StorageDiskType.FLUIDS, stack);
} }
} }
} }
@@ -117,7 +117,7 @@ public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvid
public void onCreated(ItemStack stack, World world, EntityPlayer player) { public void onCreated(ItemStack stack, World world, EntityPlayer player) {
super.onCreated(stack, world, player); super.onCreated(stack, world, player);
API.instance().getStorageDiskBehavior().initDisk(StorageDiskType.FLUIDS, stack); API.instance().getDefaultStorageDiskBehavior().initDisk(StorageDiskType.FLUIDS, stack);
} }
@Override @Override
@@ -127,12 +127,12 @@ public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvid
@Override @Override
public NBTTagCompound getNBTShareTag(ItemStack stack) { public NBTTagCompound getNBTShareTag(ItemStack stack) {
return API.instance().getStorageDiskBehavior().getShareTag(StorageDiskType.FLUIDS, stack); return API.instance().getDefaultStorageDiskBehavior().getShareTag(StorageDiskType.FLUIDS, stack);
} }
@Nonnull @Nonnull
@Override @Override
public IStorageDisk<FluidStack> create(ItemStack disk) { public IStorageDisk<FluidStack> create(ItemStack disk) {
return API.instance().getStorageDiskBehavior().createFluidStorage(disk.getTagCompound(), EnumFluidStorageType.getById(disk.getItemDamage()).getCapacity()); return API.instance().getDefaultStorageDiskBehavior().createFluidStorage(disk.getTagCompound(), EnumFluidStorageType.getById(disk.getItemDamage()).getCapacity());
} }
} }

12
src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java
View File

@@ -46,7 +46,7 @@ public class ItemStorageDisk extends ItemBase implements IStorageDiskProvider<It
@Override @Override
public void getSubItems(Item item, CreativeTabs tab, NonNullList<ItemStack> subItems) { public void getSubItems(Item item, CreativeTabs tab, NonNullList<ItemStack> subItems) {
for (int i = 0; i < 5; ++i) { for (int i = 0; i < 5; ++i) {
subItems.add(API.instance().getStorageDiskBehavior().initDisk(StorageDiskType.ITEMS, new ItemStack(item, 1, i))); subItems.add(API.instance().getDefaultStorageDiskBehavior().initDisk(StorageDiskType.ITEMS, new ItemStack(item, 1, i)));
} }
} }
@@ -58,14 +58,14 @@ public class ItemStorageDisk extends ItemBase implements IStorageDiskProvider<It
if (stack.getItemDamage() == TYPE_DEBUG) { if (stack.getItemDamage() == TYPE_DEBUG) {
applyDebugDiskData(stack); applyDebugDiskData(stack);
} else { } else {
API.instance().getStorageDiskBehavior().initDisk(StorageDiskType.ITEMS, stack); API.instance().getDefaultStorageDiskBehavior().initDisk(StorageDiskType.ITEMS, stack);
} }
} }
} }
private void applyDebugDiskData(ItemStack stack) { private void applyDebugDiskData(ItemStack stack) {
if (debugDiskTag == null) { if (debugDiskTag == null) {
debugDiskTag = API.instance().getStorageDiskBehavior().getTag(StorageDiskType.ITEMS); debugDiskTag = API.instance().getDefaultStorageDiskBehavior().getTag(StorageDiskType.ITEMS);
StorageDiskItem storage = new StorageDiskItem(debugDiskTag, -1); StorageDiskItem storage = new StorageDiskItem(debugDiskTag, -1);
@@ -127,7 +127,7 @@ public class ItemStorageDisk extends ItemBase implements IStorageDiskProvider<It
public void onCreated(ItemStack stack, World world, EntityPlayer player) { public void onCreated(ItemStack stack, World world, EntityPlayer player) {
super.onCreated(stack, world, player); super.onCreated(stack, world, player);
API.instance().getStorageDiskBehavior().initDisk(StorageDiskType.ITEMS, stack); API.instance().getDefaultStorageDiskBehavior().initDisk(StorageDiskType.ITEMS, stack);
} }
@Override @Override
@@ -137,12 +137,12 @@ public class ItemStorageDisk extends ItemBase implements IStorageDiskProvider<It
@Override @Override
public NBTTagCompound getNBTShareTag(ItemStack stack) { public NBTTagCompound getNBTShareTag(ItemStack stack) {
return API.instance().getStorageDiskBehavior().getShareTag(StorageDiskType.ITEMS, stack); return API.instance().getDefaultStorageDiskBehavior().getShareTag(StorageDiskType.ITEMS, stack);
} }
@Nonnull @Nonnull
@Override @Override
public IStorageDisk<ItemStack> create(ItemStack disk) { public IStorageDisk<ItemStack> create(ItemStack disk) {
return API.instance().getStorageDiskBehavior().createItemStorage(disk.getTagCompound(), EnumItemStorageType.getById(disk.getItemDamage()).getCapacity()); return API.instance().getDefaultStorageDiskBehavior().createItemStorage(disk.getTagCompound(), EnumItemStorageType.getById(disk.getItemDamage()).getCapacity());
} }
} }