mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge branch 'development' into 1.9.4
* development: Completed Opaque Transmitter implementation. Yay! Fix Reactor Ports, again Bump up Electrolytic Separator gas output Fixed Reactor Port crash compleatly replaced files removed the word "opaque" in all image names added boolean opaque added boolean opaque loaded config before Tier.init() added new opaque images Conflicts: src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java src/main/java/mekanism/common/multipart/PartMechanicalPipe.java src/main/java/mekanism/common/multipart/PartPressurizedTube.java src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java src/main/java/mekanism/common/multipart/PartUniversalCable.java src/main/java/mekanism/common/multipart/TransmitterIcons.java src/main/java/mekanism/common/network/PacketTransmitterUpdate.java src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
This commit is contained in:
commit
51342603d4
86 files changed
+189
-67
No files matched your search
@@ -6,6 +6,7 @@ import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.api.MekanismConfig.client;
|
||||
import mekanism.api.gas.Gas;
|
||||
import mekanism.api.gas.GasNetwork;
|
||||
import mekanism.api.gas.GasRegistry;
|
||||
@@ -66,7 +67,13 @@ public class PacketTransmitterUpdate implements IMessageHandler<TransmitterUpdat
|
||||
network.updateCapacity();
|
||||
}
|
||||
}
|
||||
else if(message.packetType == PacketType.ENERGY)
|
||||
|
||||
if(client.opaqueTransmitters || message.coord4D == null || player == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if(message.packetType == PacketType.ENERGY)
|
||||
{
|
||||
TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj);
|
||||
|
||||
|
||||
Reference in new issue
Block a user