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

Fix rare crash if a storage block is corrupted.

Browse Source
This commit is contained in:
raoulvdberge
2018-07-05 13:49:04 +02:00
parent c9c858a835
commit 3c84c15694
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeFluidStorage.java
View File

@@ -53,7 +53,7 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IGuiStorage,
private int compare = IComparer.COMPARE_NBT;
private int mode = IFilterable.BLACKLIST;
private UUID storageId;
private UUID storageId = UUID.randomUUID();
private IStorageDisk<FluidStack> storage;
public NetworkNodeFluidStorage(World world, BlockPos pos) {
@@ -79,6 +79,10 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IGuiStorage,
@Override
public void addFluidStorages(List<IStorage<FluidStack>> storages) {
if (storage == null) {
loadStorage();
}
storages.add(storage);
}

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeStorage.java
View File

@@ -53,7 +53,7 @@ public class NetworkNodeStorage extends NetworkNode implements IGuiStorage, ISto
private int compare = IComparer.COMPARE_NBT | IComparer.COMPARE_DAMAGE;
private int mode = IFilterable.BLACKLIST;
private UUID storageId;
private UUID storageId = UUID.randomUUID();
private IStorageDisk<ItemStack> storage;
public NetworkNodeStorage(World world, BlockPos pos) {
@@ -74,6 +74,10 @@ public class NetworkNodeStorage extends NetworkNode implements IGuiStorage, ISto
@Override
public void addItemStorages(List<IStorage<ItemStack>> storages) {
if (storage == null) {
loadStorage();
}
storages.add(storage);
}

3
src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java
View File

@@ -23,7 +23,6 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import javax.annotation.Nullable;
import java.util.UUID;
public class BlockFluidStorage extends BlockNode {
public static final PropertyEnum TYPE = PropertyEnum.create("type", FluidStorageType.class);
@@ -90,8 +89,6 @@ public class BlockFluidStorage extends BlockNode {
if (stack.hasTagCompound() && stack.getTagCompound().hasUniqueId(NetworkNodeFluidStorage.NBT_ID)) {
storage.setStorageId(stack.getTagCompound().getUniqueId(NetworkNodeFluidStorage.NBT_ID));
} else {
storage.setStorageId(UUID.randomUUID());
}
storage.loadStorage();

3
src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java
View File

@@ -23,7 +23,6 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import javax.annotation.Nullable;
import java.util.UUID;
public class BlockStorage extends BlockNode {
public static final PropertyEnum TYPE = PropertyEnum.create("type", ItemStorageType.class);
@@ -90,8 +89,6 @@ public class BlockStorage extends BlockNode {
if (stack.hasTagCompound() && stack.getTagCompound().hasUniqueId(NetworkNodeStorage.NBT_ID)) {
storage.setStorageId(stack.getTagCompound().getUniqueId(NetworkNodeStorage.NBT_ID));
} else {
storage.setStorageId(UUID.randomUUID());
}
storage.loadStorage();

1
src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelCover.java
View File

@@ -124,6 +124,7 @@ public class BakedModelCover implements IBakedModel {
}
@Override
@SuppressWarnings("deprecation")
public ItemCameraTransforms getItemCameraTransforms() {
return base.getItemCameraTransforms();
}