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

@@ -32,7 +32,6 @@ public class TileComponentSecurity implements ITileComponent {
public TileComponentSecurity(TileEntityContainerBlock tile) {
tileEntity = tile;
tile.components.add(this);
}
@@ -53,7 +52,6 @@ public class TileComponentSecurity implements ITileComponent {
if (freq.ownerUUID.equals(owner)) {
frequency = (SecurityFrequency) freq;
frequency.activeCoords.add(Coord4D.get(tileEntity));
return;
}
}
@@ -83,9 +81,8 @@ public class TileComponentSecurity implements ITileComponent {
public SecurityMode getMode() {
if (MekanismConfig.current().general.allowProtection.val()) {
return securityMode;
} else {
return SecurityMode.PUBLIC;
}
return SecurityMode.PUBLIC;
}
public void setMode(SecurityMode mode) {
@@ -96,7 +93,6 @@ public class TileComponentSecurity implements ITileComponent {
if (ownerUUID == null || freq == null) {
return null;
}
return Mekanism.securityFrequencies;
}
@@ -106,15 +102,12 @@ public class TileComponentSecurity implements ITileComponent {
if (frequency == null && ownerUUID != null) {
setFrequency(ownerUUID);
}
FrequencyManager manager = getManager(frequency);
if (manager != null) {
if (frequency != null && !frequency.valid) {
frequency = (SecurityFrequency) manager
.validateFrequency(ownerUUID, Coord4D.get(tileEntity), frequency);
frequency = (SecurityFrequency) manager.validateFrequency(ownerUUID, Coord4D.get(tileEntity), frequency);
}
if (frequency != null) {
frequency = (SecurityFrequency) manager.update(Coord4D.get(tileEntity), frequency);
}
@@ -127,11 +120,9 @@ public class TileComponentSecurity implements ITileComponent {
@Override
public void read(NBTTagCompound nbtTags) {
securityMode = SecurityMode.values()[nbtTags.getInteger("securityMode")];
if (nbtTags.hasKey("ownerUUID")) {
ownerUUID = UUID.fromString(nbtTags.getString("ownerUUID"));
}
if (nbtTags.hasKey("securityFreq")) {
frequency = new SecurityFrequency(nbtTags.getCompoundTag("securityFreq"));
frequency.valid = false;
@@ -160,11 +151,9 @@ public class TileComponentSecurity implements ITileComponent {
@Override
public void write(NBTTagCompound nbtTags) {
nbtTags.setInteger("securityMode", securityMode.ordinal());
if (ownerUUID != null) {
nbtTags.setString("ownerUUID", ownerUUID.toString());
}
if (frequency != null) {
NBTTagCompound frequencyTag = new NBTTagCompound();
frequency.write(frequencyTag);
@@ -197,11 +186,10 @@ public class TileComponentSecurity implements ITileComponent {
if (!tileEntity.getWorld().isRemote) {
if (frequency != null) {
FrequencyManager manager = getManager(frequency);
if (manager != null) {
manager.deactivate(Coord4D.get(tileEntity));
}
}
}
}
}
}