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

@@ -19,14 +19,11 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural
public boolean onActivate(EntityPlayer player, EnumHand hand, ItemStack stack) {
if (master != null) {
TileEntity masterTile = master.getTileEntity(world);
if (masterTile instanceof IMultiblock) {
return ((IMultiblock<?>) masterTile).onActivate(player, hand, stack);
} else {
master = null;
}
master = null;
}
return false;
}
@@ -34,7 +31,6 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural
public void doUpdate() {
if (master != null) {
TileEntity masterTile = master.getTileEntity(world);
if (masterTile instanceof IMultiblock) {
((IMultiblock<?>) masterTile).doUpdate();
} else {
@@ -42,7 +38,6 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural
}
} else {
IMultiblock<?> multiblock = new ControllerFinder().find();
if (multiblock != null) {
multiblock.doUpdate();
}
@@ -69,13 +64,10 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural
if (iterated.size() > 2048 || found != null) {
return;
}
iterated.add(pos);
for (EnumFacing side : EnumFacing.VALUES) {
Coord4D coord = pos.offset(side);
TileEntity tile = coord.getTileEntity(world);
if (!iterated.contains(coord)) {
if (tile instanceof IMultiblock) {
found = (IMultiblock<?>) tile;
@@ -89,8 +81,7 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural
public IMultiblock<?> find() {
loop(Coord4D.get(TileEntityStructuralGlass.this));
return found;
}
}
}
}