tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed transmitter crash, fixed entangloporter frequency issue, fixed PRC muffling upgrades

Browse source
This commit is contained in:
aidancbrady 2016-06-10 11:11:41 -04:00
parent 17c9c5910a
commit e18570b679
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/mekanism/client/render/RenderPartTransmitter.java
View file

@ -630,6 +630,11 @@ public class RenderPartTransmitter implements IIconSelfRegister
public void renderTransparency(IIcon icon, CCModel cc, Colour color) public void renderTransparency(IIcon icon, CCModel cc, Colour color)
{ {
if(icon == null)
{
return;
}
if(color != null) if(color != null)
{ {
cc.render(new IconTransformation(icon), new ColourMultiplier(color.rgba())); cc.render(new IconTransformation(icon), new ColourMultiplier(color.rgba()));

2
src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java
View file

@ -90,7 +90,7 @@ public class InventoryFrequency extends Frequency
if(nbtTags.hasKey("storedItem")) if(nbtTags.hasKey("storedItem"))
{ {
storedItem.readFromNBT(nbtTags.getCompoundTag("storedItem")); storedItem = ItemStack.loadItemStackFromNBT(nbtTags.getCompoundTag("storedItem"));
} }
temperature = nbtTags.getDouble("temperature"); temperature = nbtTags.getDouble("temperature");

2
src/main/java/mekanism/common/tile/TileEntityPRC.java
View file

@ -76,6 +76,8 @@ public class TileEntityPRC extends TileEntityBasicMachine<PressurizedInput, Pres
inventory = new ItemStack[4]; inventory = new ItemStack[4];
upgradeComponent = new TileComponentUpgrade(this, 3); upgradeComponent = new TileComponentUpgrade(this, 3);
upgradeComponent.setSupported(Upgrade.MUFFLING);
ejectorComponent = new TileComponentEjector(this); ejectorComponent = new TileComponentEjector(this);
ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(3)); ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(3));
ejectorComponent.setOutputData(TransmissionType.GAS, configComponent.getOutputs(TransmissionType.GAS).get(2)); ejectorComponent.setOutputData(TransmissionType.GAS, configComponent.getOutputs(TransmissionType.GAS).get(2));