Formatting and code readability cleanup (#5467)

* First pass reformatting code to be more readable (common still not done)

* Replace google common collect calls with Java calls where possible

* Remove a bunch of unnecessary parenthesis leaving clarifying ones

* Add some missing @Nonnull annotations

* Fix checking wrong type

* Remove unnecessary continue/return statements and simplify comparision check

* Pass exception instead of directly printing stack trace

* Work on cleaning up common, through config so far

* Work on cleaning up common, through integration so far

* Work on cleaning up common, through network so far

* Work on cleaning up common, through tier so far

* Remove empty constructors that get created by default anyways

* Work on cleaning up common, through transmitters so far

* Work on cleaning up common, through utils so far

* Finish cleaning up spacing for common
This commit is contained in:
Richard Freimer authored and GitHub committed 2019-05-11 14:13:24 -04:00
1 parent 91ef2a5c3d
commit 0d4b50908f
909 files changed
+6234 -15623

No files matched your search

@@ -2,11 +2,11 @@ package mekanism.common.network;
import io.netty.buffer.ByteBuf;
import mekanism.api.Coord4D;
import mekanism.api.TileNetworkList;
import mekanism.api.transmitters.IGridTransmitter;
import mekanism.common.Mekanism;
import mekanism.common.PacketHandler;
import mekanism.common.base.ITileNetwork;
import mekanism.api.TileNetworkList;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.network.PacketDataRequest.DataRequestMessage;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
@@ -26,39 +26,26 @@ public class PacketDataRequest implements IMessageHandler<DataRequestMessage, IM
@Override
public IMessage onMessage(DataRequestMessage message, MessageContext context) {
EntityPlayer player = PacketHandler.getPlayer(context);
PacketHandler.handlePacket(() ->
{
PacketHandler.handlePacket(() -> {
World worldServer = DimensionManager.getWorld(message.coord4D.dimensionId);
if (worldServer != null) {
TileEntity tileEntity = message.coord4D.getTileEntity(worldServer);
if (tileEntity instanceof TileEntityMultiblock) {
((TileEntityMultiblock<?>) tileEntity).sendStructure = true;
}
if (CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) {
IGridTransmitter transmitter = CapabilityUtils
.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null);
IGridTransmitter transmitter = CapabilityUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null);
transmitter.setRequestsUpdate();
if (transmitter.hasTransmitterNetwork()) {
transmitter.getTransmitterNetwork().addUpdate(player);
}
}
if (CapabilityUtils.hasCapability(tileEntity, Capabilities.TILE_NETWORK_CAPABILITY, null)) {
ITileNetwork network = CapabilityUtils
.getCapability(tileEntity, Capabilities.TILE_NETWORK_CAPABILITY, null);
Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(tileEntity),
network.getNetworkedData(new TileNetworkList())), (EntityPlayerMP) player);
ITileNetwork network = CapabilityUtils.getCapability(tileEntity, Capabilities.TILE_NETWORK_CAPABILITY, null);
Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(tileEntity), network.getNetworkedData(new TileNetworkList())), (EntityPlayerMP) player);
}
}
}, player);
return null;
}
@@ -83,4 +70,4 @@ public class PacketDataRequest implements IMessageHandler<DataRequestMessage, IM
coord4D = Coord4D.read(dataStream);
}
}
}
}