From e18570b679669dec53bc88b852ff5f725096263a Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 10 Jun 2016 11:11:41 -0400 Subject: [PATCH] Fixed transmitter crash, fixed entangloporter frequency issue, fixed PRC muffling upgrades --- .../java/mekanism/client/render/RenderPartTransmitter.java | 5 +++++ .../common/content/entangloporter/InventoryFrequency.java | 2 +- src/main/java/mekanism/common/tile/TileEntityPRC.java | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/client/render/RenderPartTransmitter.java b/src/main/java/mekanism/client/render/RenderPartTransmitter.java index 03362b071..b88ed0a98 100644 --- a/src/main/java/mekanism/client/render/RenderPartTransmitter.java +++ b/src/main/java/mekanism/client/render/RenderPartTransmitter.java @@ -630,6 +630,11 @@ public class RenderPartTransmitter implements IIconSelfRegister public void renderTransparency(IIcon icon, CCModel cc, Colour color) { + if(icon == null) + { + return; + } + if(color != null) { cc.render(new IconTransformation(icon), new ColourMultiplier(color.rgba())); diff --git a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java index c769bd490..9dbf0ec6a 100644 --- a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java +++ b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java @@ -90,7 +90,7 @@ public class InventoryFrequency extends Frequency if(nbtTags.hasKey("storedItem")) { - storedItem.readFromNBT(nbtTags.getCompoundTag("storedItem")); + storedItem = ItemStack.loadItemStackFromNBT(nbtTags.getCompoundTag("storedItem")); } temperature = nbtTags.getDouble("temperature"); diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index c0fea36e5..a220cf3f2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -76,6 +76,8 @@ public class TileEntityPRC extends TileEntityBasicMachine