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

Add null checks

Browse Source
This commit is contained in:
raoulvdberge
2019-10-28 10:41:47 +01:00
parent 2a2d9a1a07
commit 7694b099d6
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,12 +203,20 @@ public class API implements IRSAPI {
@Override
@Nonnull
public IStorageDisk<ItemStack> createDefaultItemDisk(ServerWorld world, int capacity) {
if (world == null) {
throw new IllegalArgumentException("World cannot be null");
}
return new ItemStorageDisk(world, capacity);
}
@Override
@Nonnull
public IStorageDisk<FluidStack> createDefaultFluidDisk(ServerWorld world, int capacity) {
if (world == null) {
throw new IllegalArgumentException("World cannot be null");
}
return new FluidStorageDisk(world, capacity);
}

8
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/factory/FluidStorageDiskFactory.java
View File

@@ -16,6 +16,10 @@ public class FluidStorageDiskFactory implements IStorageDiskFactory<FluidStack>
@Override
public IStorageDisk<FluidStack> createFromNbt(ServerWorld world, CompoundNBT tag) {
if (world == null) {
throw new IllegalArgumentException("World cannot be null");
}
FluidStorageDisk disk = new FluidStorageDisk(world, tag.getInt(FluidStorageDisk.NBT_CAPACITY));
ListNBT list = tag.getList(FluidStorageDisk.NBT_FLUIDS, Constants.NBT.TAG_COMPOUND);
@@ -33,6 +37,10 @@ public class FluidStorageDiskFactory implements IStorageDiskFactory<FluidStack>
@Override
public IStorageDisk<FluidStack> create(ServerWorld world, int capacity) {
if (world == null) {
throw new IllegalArgumentException("World cannot be null");
}
return new FluidStorageDisk(world, capacity);
}
}

8
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/disk/factory/ItemStorageDiskFactory.java
View File

@@ -17,6 +17,10 @@ public class ItemStorageDiskFactory implements IStorageDiskFactory<ItemStack> {
@Override
public IStorageDisk<ItemStack> createFromNbt(ServerWorld world, CompoundNBT tag) {
if (world == null) {
throw new IllegalArgumentException("World cannot be null");
}
ItemStorageDisk disk = new ItemStorageDisk(world, tag.getInt(ItemStorageDisk.NBT_CAPACITY));
ListNBT list = tag.getList(ItemStorageDisk.NBT_ITEMS, Constants.NBT.TAG_COMPOUND);
@@ -34,6 +38,10 @@ public class ItemStorageDiskFactory implements IStorageDiskFactory<ItemStack> {
@Override
public IStorageDisk<ItemStack> create(ServerWorld world, int capacity) {
if (world == null) {
throw new IllegalArgumentException("World cannot be null");
}
return new ItemStorageDisk(world, capacity);
}
}