diff options
Diffstat (limited to 'src/main/java/gregtech/api/objects')
5 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/gregtech/api/objects/GTChunkManager.java b/src/main/java/gregtech/api/objects/GTChunkManager.java index 436fd0d7d8..2fc87f148d 100644 --- a/src/main/java/gregtech/api/objects/GTChunkManager.java +++ b/src/main/java/gregtech/api/objects/GTChunkManager.java @@ -116,7 +116,7 @@ public class GTChunkManager ForgeChunkManager.forceChunk(instance.registeredTickets.get(owner), chunkXZ); } else { Ticket ticket; - if (player.equals("")) ticket = ForgeChunkManager + if (player.isEmpty()) ticket = ForgeChunkManager .requestTicket(GTMod.instance, owner.getWorldObj(), ForgeChunkManager.Type.NORMAL); else ticket = ForgeChunkManager .requestPlayerTicket(GTMod.instance, player, owner.getWorldObj(), ForgeChunkManager.Type.NORMAL); diff --git a/src/main/java/gregtech/api/objects/ItemData.java b/src/main/java/gregtech/api/objects/ItemData.java index 071b09a55f..5c36ea68e1 100644 --- a/src/main/java/gregtech/api/objects/ItemData.java +++ b/src/main/java/gregtech/api/objects/ItemData.java @@ -117,6 +117,6 @@ public class ItemData { @Override public String toString() { if (mPrefix == null || mMaterial == null || mMaterial.mMaterial == null) return ""; - return String.valueOf(mPrefix.name() + mMaterial.mMaterial.mName); + return mPrefix.name() + mMaterial.mMaterial.mName; } } diff --git a/src/main/java/gregtech/api/objects/MaterialStack.java b/src/main/java/gregtech/api/objects/MaterialStack.java index 742c210901..4a0af6f948 100644 --- a/src/main/java/gregtech/api/objects/MaterialStack.java +++ b/src/main/java/gregtech/api/objects/MaterialStack.java @@ -57,7 +57,7 @@ public class MaterialStack implements Cloneable { if (materialStack.mMaterial.mMaterialList.size() > 1) { return true; } - if (materialStack.mMaterial.mMaterialList.size() == 0) { + if (materialStack.mMaterial.mMaterialList.isEmpty()) { return false; } return isMaterialListComplex(materialStack.mMaterial.mMaterialList.get(0)); diff --git a/src/main/java/gregtech/api/objects/blockupdate/BlockUpdateHandler.java b/src/main/java/gregtech/api/objects/blockupdate/BlockUpdateHandler.java index e8f084ea34..78924f1a47 100644 --- a/src/main/java/gregtech/api/objects/blockupdate/BlockUpdateHandler.java +++ b/src/main/java/gregtech/api/objects/blockupdate/BlockUpdateHandler.java @@ -35,8 +35,8 @@ public class BlockUpdateHandler { private BlockUpdateHandler() { - blocksToUpdate = new HashMap<ChunkCoordIntPair, WorldCoord>(); - cooldowns = new HashMap<ChunkCoordIntPair, RandomCooldown>(); + blocksToUpdate = new HashMap<>(); + cooldowns = new HashMap<>(); FMLCommonHandler.instance() .bus() @@ -110,8 +110,8 @@ public class BlockUpdateHandler { return chunk.getChunkCoordIntPair(); } - private HashMap<ChunkCoordIntPair, WorldCoord> blocksToUpdate; - private HashMap<ChunkCoordIntPair, RandomCooldown> cooldowns; + private final HashMap<ChunkCoordIntPair, WorldCoord> blocksToUpdate; + private final HashMap<ChunkCoordIntPair, RandomCooldown> cooldowns; private World currWorld = null; private long internalTickCounter = 0; } diff --git a/src/main/java/gregtech/api/objects/blockupdate/RandomCooldown.java b/src/main/java/gregtech/api/objects/blockupdate/RandomCooldown.java index d275c29744..8c46e5a1ec 100644 --- a/src/main/java/gregtech/api/objects/blockupdate/RandomCooldown.java +++ b/src/main/java/gregtech/api/objects/blockupdate/RandomCooldown.java @@ -26,6 +26,6 @@ public class RandomCooldown extends Cooldown { lengthInTicks = minLengthInTicks + XSTR_INSTANCE.nextInt(maxLengthInTicks - minLengthInTicks + 1); } - private int minLengthInTicks; - private int maxLengthInTicks; + private final int minLengthInTicks; + private final int maxLengthInTicks; } |