cleanup: use for-each loop where applicable

This commit is contained in:
P0nk
2021-04-08 07:36:38 +02:00
parent 0ff8a80ef2
commit 5c6f515d18
16 changed files with 103 additions and 105 deletions

View File

@@ -120,8 +120,8 @@ public class ThreadTracker {
private static String printThreadStack(StackTraceElement[] list, String dateFormat) { private static String printThreadStack(StackTraceElement[] list, String dateFormat) {
String s = "----------------------------\r\n" + dateFormat + "\r\n"; String s = "----------------------------\r\n" + dateFormat + "\r\n";
for(int i = 0; i < list.length; i++) { for (StackTraceElement stackTraceElement : list) {
s += (" " + list[i].toString() + "\r\n"); s += (" " + stackTraceElement.toString() + "\r\n");
} }
return s; return s;

View File

@@ -136,8 +136,8 @@ public class TrackerReadLock extends ReentrantReadWriteLock.ReadLock implements
private static String printStackTrace(StackTraceElement[] list) { private static String printStackTrace(StackTraceElement[] list) {
String s = ""; String s = "";
for(int i = 0; i < list.length; i++) { for (StackTraceElement stackTraceElement : list) {
s += (" " + list[i].toString() + "\r\n"); s += (" " + stackTraceElement.toString() + "\r\n");
} }
return s; return s;

View File

@@ -140,8 +140,8 @@ public class TrackerReentrantLock extends ReentrantLock implements MonitoredReen
private static String printStackTrace(StackTraceElement[] list) { private static String printStackTrace(StackTraceElement[] list) {
String s = ""; String s = "";
for(int i = 0; i < list.length; i++) { for (StackTraceElement stackTraceElement : list) {
s += (" " + list[i].toString() + "\r\n"); s += (" " + stackTraceElement.toString() + "\r\n");
} }
return s; return s;

View File

@@ -136,8 +136,8 @@ public class TrackerWriteLock extends ReentrantReadWriteLock.WriteLock implement
private static String printStackTrace(StackTraceElement[] list) { private static String printStackTrace(StackTraceElement[] list) {
String s = ""; String s = "";
for(int i = 0; i < list.length; i++) { for (StackTraceElement stackTraceElement : list) {
s += (" " + list[i].toString() + "\r\n"); s += (" " + stackTraceElement.toString() + "\r\n");
} }
return s; return s;

View File

@@ -13,8 +13,8 @@ public abstract class AbstractEmptyLock {
String df = dateFormat.format(new Date()); String df = dateFormat.format(new Date());
String s = "\r\n" + df + "\r\n"; String s = "\r\n" + df + "\r\n";
for(int i = 0; i < list.length; i++) { for (StackTraceElement stackTraceElement : list) {
s += (" " + list[i].toString() + "\r\n"); s += (" " + stackTraceElement.toString() + "\r\n");
} }
s += "----------------------------\r\n\r\n"; s += "----------------------------\r\n\r\n";

View File

@@ -21,9 +21,11 @@
*/ */
package net.server.channel.handlers; package net.server.channel.handlers;
import java.util.Arrays; import client.MapleCharacter;
import java.util.List; import client.MapleClient;
import client.inventory.MapleInventory;
import client.inventory.MapleInventoryType;
import client.inventory.manipulator.MapleInventoryManipulator;
import net.AbstractMaplePacketHandler; import net.AbstractMaplePacketHandler;
import server.MapleItemInformationProvider; import server.MapleItemInformationProvider;
import server.life.MapleLifeFactory; import server.life.MapleLifeFactory;
@@ -34,11 +36,9 @@ import server.quest.MapleQuest;
import tools.MaplePacketCreator; import tools.MaplePacketCreator;
import tools.Randomizer; import tools.Randomizer;
import tools.data.input.SeekableLittleEndianAccessor; import tools.data.input.SeekableLittleEndianAccessor;
import client.MapleCharacter;
import client.MapleClient; import java.util.Arrays;
import client.inventory.MapleInventory; import java.util.List;
import client.inventory.MapleInventoryType;
import client.inventory.manipulator.MapleInventoryManipulator;
public final class AdminCommandHandler extends AbstractMaplePacketHandler { public final class AdminCommandHandler extends AbstractMaplePacketHandler {
@@ -53,8 +53,7 @@ public final class AdminCommandHandler extends AbstractMaplePacketHandler {
switch (mode) { switch (mode) {
case 0x00: // Level1~Level8 & Package1~Package2 case 0x00: // Level1~Level8 & Package1~Package2
int[][] toSpawn = MapleItemInformationProvider.getInstance().getSummonMobs(slea.readInt()); int[][] toSpawn = MapleItemInformationProvider.getInstance().getSummonMobs(slea.readInt());
for (int z = 0; z < toSpawn.length; z++) { for (int[] toSpawnChild : toSpawn) {
int[] toSpawnChild = toSpawn[z];
if (Randomizer.nextInt(100) < toSpawnChild[1]) { if (Randomizer.nextInt(100) < toSpawnChild[1]) {
c.getPlayer().getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(toSpawnChild[0]), c.getPlayer().getPosition()); c.getPlayer().getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(toSpawnChild[0]), c.getPlayer().getPosition());
} }

View File

@@ -24,12 +24,12 @@ package net.server.channel.handlers;
import client.MapleClient; import client.MapleClient;
import client.inventory.Item; import client.inventory.Item;
import client.inventory.MapleInventoryType; import client.inventory.MapleInventoryType;
import tools.Randomizer;
import net.AbstractMaplePacketHandler;
import client.inventory.manipulator.MapleInventoryManipulator; import client.inventory.manipulator.MapleInventoryManipulator;
import net.AbstractMaplePacketHandler;
import server.MapleItemInformationProvider; import server.MapleItemInformationProvider;
import server.life.MapleLifeFactory; import server.life.MapleLifeFactory;
import tools.MaplePacketCreator; import tools.MaplePacketCreator;
import tools.Randomizer;
import tools.data.input.SeekableLittleEndianAccessor; import tools.data.input.SeekableLittleEndianAccessor;
/** /**
@@ -52,8 +52,7 @@ public final class UseSummonBagHandler extends AbstractMaplePacketHandler {
if (toUse != null && toUse.getQuantity() > 0 && toUse.getItemId() == itemId) { if (toUse != null && toUse.getQuantity() > 0 && toUse.getItemId() == itemId) {
MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, slot, (short) 1, false); MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.USE, slot, (short) 1, false);
int[][] toSpawn = MapleItemInformationProvider.getInstance().getSummonMobs(itemId); int[][] toSpawn = MapleItemInformationProvider.getInstance().getSummonMobs(itemId);
for (int z = 0; z < toSpawn.length; z++) { for (int[] toSpawnChild : toSpawn) {
int[] toSpawnChild = toSpawn[z];
if (Randomizer.nextInt(100) < toSpawnChild[1]) { if (Randomizer.nextInt(100) < toSpawnChild[1]) {
c.getPlayer().getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(toSpawnChild[0]), c.getPlayer().getPosition()); c.getPlayer().getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(toSpawnChild[0]), c.getPlayer().getPosition());
} }

View File

@@ -22,7 +22,9 @@
package net.server.handlers.login; package net.server.handlers.login;
import client.MapleClient; import client.MapleClient;
import client.creator.novice.*; import client.creator.novice.BeginnerCreator;
import client.creator.novice.LegendCreator;
import client.creator.novice.NoblesseCreator;
import net.AbstractMaplePacketHandler; import net.AbstractMaplePacketHandler;
import tools.FilePrinter; import tools.FilePrinter;
import tools.MaplePacketCreator; import tools.MaplePacketCreator;
@@ -66,8 +68,8 @@ public final class CreateCharHandler extends AbstractMaplePacketHandler {
int gender = slea.readByte(); int gender = slea.readByte();
int [] items = new int [] {weapon, top, bottom, shoes, hair, face}; int [] items = new int [] {weapon, top, bottom, shoes, hair, face};
for (int i = 0; i < items.length; i++){ for (int item : items) {
if (!isLegal(items[i])) { if (!isLegal(item)) {
FilePrinter.printError(FilePrinter.EXPLOITS + name + ".txt", "Owner from account '" + c.getAccountName() + "' tried to packet edit in char creation."); FilePrinter.printError(FilePrinter.EXPLOITS + name + ".txt", "Owner from account '" + c.getAccountName() + "' tried to packet edit in char creation.");
c.disconnect(true, false); c.disconnect(true, false);
return; return;

View File

@@ -41,8 +41,8 @@ public class ServicesManager {
} }
public void shutdown() { public void shutdown() {
for (int i = 0; i < services.length; i++) { for (Service service : services) {
services[i].dispose(); service.dispose();
} }
services = null; services = null;
} }

View File

@@ -62,10 +62,10 @@ public class WZIMGEntry implements MapleData {
return ((MapleData) getParent()).getChildByPath(path.substring(path.indexOf("/") + 1)); return ((MapleData) getParent()).getChildByPath(path.substring(path.indexOf("/") + 1));
} }
MapleData ret = this; MapleData ret = this;
for (int x = 0; x < segments.length; x++) { for (String segment : segments) {
boolean foundChild = false; boolean foundChild = false;
for (MapleData child : ret.getChildren()) { for (MapleData child : ret.getChildren()) {
if (child.getName().equals(segments[x])) { if (child.getName().equals(segment)) {
ret = child; ret = child;
foundChild = true; foundChild = true;
break; break;

View File

@@ -776,8 +776,8 @@ public class AbstractPlayerInteraction {
public void removeHPQItems() { public void removeHPQItems() {
int[] items = {4001095, 4001096, 4001097, 4001098, 4001099, 4001100, 4001101}; int[] items = {4001095, 4001096, 4001097, 4001098, 4001099, 4001100, 4001101};
for (int i = 0; i < items.length; i ++) { for (int item : items) {
removePartyItems(items[i]); removePartyItems(item);
} }
} }

View File

@@ -247,8 +247,8 @@ dispose(false);
} }
public void monsterKilled(MapleCharacter chr, MapleMonster mob) { public void monsterKilled(MapleCharacter chr, MapleMonster mob) {
for (int i = 0; i < EXPEDITION_BOSSES.length; i++) { for (int expeditionBoss : EXPEDITION_BOSSES) {
if (mob.getId() == EXPEDITION_BOSSES[i]) { //If the monster killed was a boss if (mob.getId() == expeditionBoss) { //If the monster killed was a boss
String timeStamp = new SimpleDateFormat("HH:mm:ss").format(new Date()); String timeStamp = new SimpleDateFormat("HH:mm:ss").format(new Date());
bossLogs.add(">" + mob.getName() + " was killed after " + LogHelper.getTimeString(startTime) + " - " + timeStamp + "\r\n"); bossLogs.add(">" + mob.getName() + " was killed after " + LogHelper.getTimeString(startTime) + " - " + timeStamp + "\r\n");
return; return;

View File

@@ -2188,12 +2188,12 @@ public class MapleMap {
final Point dropPos = new Point(pos); final Point dropPos = new Point(pos);
dropPos.x -= (12 * list.size()); dropPos.x -= (12 * list.size());
for(int i = 0; i < list.size(); i++) { for (Integer integer : list) {
if(list.get(i) == 0) { if (integer == 0) {
spawnMesoDrop(owner != null ? 10 * owner.getMesoRate() : 10, calcDropPos(dropPos, pos), dropper, owner, playerDrop, (byte) (ffaDrop ? 2 : 0)); spawnMesoDrop(owner != null ? 10 * owner.getMesoRate() : 10, calcDropPos(dropPos, pos), dropper, owner, playerDrop, (byte) (ffaDrop ? 2 : 0));
} else { } else {
final Item drop; final Item drop;
int randomedId = list.get(i); int randomedId = integer;
if (ItemConstants.getInventoryType(randomedId) != MapleInventoryType.EQUIP) { if (ItemConstants.getInventoryType(randomedId) != MapleInventoryType.EQUIP) {
drop = new Item(randomedId, (short) 0, (short) (rnd.nextInt(copies) + minCopies)); drop = new Item(randomedId, (short) 0, (short) (rnd.nextInt(copies) + minCopies));
@@ -2459,10 +2459,10 @@ public class MapleMap {
} }
MaplePet[] pets = chr.getPets(); MaplePet[] pets = chr.getPets();
for (int i = 0; i < pets.length; i++) { for (MaplePet pet : pets) {
if (pets[i] != null) { if (pet != null) {
pets[i].setPos(getGroundBelow(chr.getPosition())); pet.setPos(getGroundBelow(chr.getPosition()));
chr.announce(MaplePacketCreator.showPet(chr, pets[i], false, false)); chr.announce(MaplePacketCreator.showPet(chr, pet, false, false));
} else { } else {
break; break;
} }

View File

@@ -22,6 +22,7 @@
package tools; package tools;
import constants.string.CharsetConstants; import constants.string.CharsetConstants;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
public class HexTool { public class HexTool {
@@ -35,8 +36,8 @@ public class HexTool {
public static String toString(byte[] bytes) { public static String toString(byte[] bytes) {
StringBuilder hexed = new StringBuilder(); StringBuilder hexed = new StringBuilder();
for (int i = 0; i < bytes.length; i++) { for (byte aByte : bytes) {
hexed.append(toString(bytes[i])); hexed.append(toString(aByte));
hexed.append(' '); hexed.append(' ');
} }
return hexed.substring(0, hexed.length() - 1); return hexed.substring(0, hexed.length() - 1);
@@ -44,8 +45,8 @@ public class HexTool {
public static String toCompressedString(byte[] bytes) { public static String toCompressedString(byte[] bytes) {
StringBuilder hexed = new StringBuilder(); StringBuilder hexed = new StringBuilder();
for (int i = 0; i < bytes.length; i++) { for (byte aByte : bytes) {
hexed.append(toString(bytes[i])); hexed.append(toString(aByte));
} }
return hexed.substring(0, hexed.length()); return hexed.substring(0, hexed.length());
} }

View File

@@ -112,8 +112,8 @@ public class MaplePacketCreator {
private static void addRemainingSkillInfo(final MaplePacketLittleEndianWriter mplew, MapleCharacter chr) { private static void addRemainingSkillInfo(final MaplePacketLittleEndianWriter mplew, MapleCharacter chr) {
int[] remainingSp = chr.getRemainingSps(); int[] remainingSp = chr.getRemainingSps();
int effectiveLength = 0; int effectiveLength = 0;
for (int i = 0; i < remainingSp.length; i++) { for (int j : remainingSp) {
if (remainingSp[i] > 0) { if (j > 0) {
effectiveLength++; effectiveLength++;
} }
} }
@@ -489,15 +489,13 @@ public class MaplePacketCreator {
Map<Skill, MapleCharacter.SkillEntry> skills = chr.getSkills(); Map<Skill, MapleCharacter.SkillEntry> skills = chr.getSkills();
int skillsSize = skills.size(); int skillsSize = skills.size();
// We don't want to include any hidden skill in this, so subtract them from the size list and ignore them. // We don't want to include any hidden skill in this, so subtract them from the size list and ignore them.
for (Iterator<Entry<Skill, SkillEntry>> it = skills.entrySet().iterator(); it.hasNext();) { for (Entry<Skill, SkillEntry> skill : skills.entrySet()) {
Entry<Skill, MapleCharacter.SkillEntry> skill = it.next();
if (GameConstants.isHiddenSkills(skill.getKey().getId())) { if (GameConstants.isHiddenSkills(skill.getKey().getId())) {
skillsSize--; skillsSize--;
} }
} }
mplew.writeShort(skillsSize); mplew.writeShort(skillsSize);
for (Iterator<Entry<Skill, SkillEntry>> it = skills.entrySet().iterator(); it.hasNext();) { for (Entry<Skill, SkillEntry> skill : skills.entrySet()) {
Entry<Skill, MapleCharacter.SkillEntry> skill = it.next();
if (GameConstants.isHiddenSkills(skill.getKey().getId())) { if (GameConstants.isHiddenSkills(skill.getKey().getId())) {
continue; continue;
} }
@@ -2767,8 +2765,7 @@ public class MaplePacketCreator {
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter(); final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
mplew.writeShort(SendOpcode.RECOMMENDED_WORLD_MESSAGE.getValue()); mplew.writeShort(SendOpcode.RECOMMENDED_WORLD_MESSAGE.getValue());
mplew.write(worlds.size());//size mplew.write(worlds.size());//size
for (Iterator<Pair<Integer, String>> it = worlds.iterator(); it.hasNext();) { for (Pair<Integer, String> world : worlds) {
Pair<Integer, String> world = it.next();
mplew.writeInt(world.getLeft()); mplew.writeInt(world.getLeft());
mplew.writeMapleAsciiString(world.getRight()); mplew.writeMapleAsciiString(world.getRight());
} }
@@ -3152,8 +3149,8 @@ public class MaplePacketCreator {
} }
} }
for (int i = 0; i < masks.length; i++) { for (int mask : masks) {
mplew.writeInt(masks[i]); mplew.writeInt(mask);
} }
} }
@@ -3483,8 +3480,8 @@ public class MaplePacketCreator {
mplew.write(0); //speaker mplew.write(0); //speaker
mplew.writeMapleAsciiString(talk); mplew.writeMapleAsciiString(talk);
mplew.write(styles.length); mplew.write(styles.length);
for (int i = 0; i < styles.length; i++) { for (int style : styles) {
mplew.writeInt(styles[i]); mplew.writeInt(style);
} }
return mplew.getPacket(); return mplew.getPacket();
} }
@@ -5586,8 +5583,8 @@ public class MaplePacketCreator {
List<Pair<Item, MapleInventoryType>> items = ItemFactory.MERCHANT.loadItems(chr.getId(), false); List<Pair<Item, MapleInventoryType>> items = ItemFactory.MERCHANT.loadItems(chr.getId(), false);
mplew.write(items.size()); mplew.write(items.size());
for (int i = 0; i < items.size(); i++) { for (Pair<Item, MapleInventoryType> item : items) {
addItemInfo(mplew, items.get(i).getLeft(), true); addItemInfo(mplew, item.getLeft(), true);
} }
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
@@ -5771,9 +5768,9 @@ public class MaplePacketCreator {
List<Pair<String, Byte>> msgList = hm.getMessages(); List<Pair<String, Byte>> msgList = hm.getMessages();
mplew.writeShort(msgList.size()); mplew.writeShort(msgList.size());
for (int i = 0; i < msgList.size(); i++) { for (Pair<String, Byte> stringBytePair : msgList) {
mplew.writeMapleAsciiString(msgList.get(i).getLeft()); mplew.writeMapleAsciiString(stringBytePair.getLeft());
mplew.write(msgList.get(i).getRight()); mplew.write(stringBytePair.getRight());
} }
} else { } else {
mplew.writeShort(0); mplew.writeShort(0);
@@ -6042,8 +6039,7 @@ public class MaplePacketCreator {
mplew.writeInt(page); mplew.writeInt(page);
mplew.write(1); mplew.write(1);
mplew.write(1); mplew.write(1);
for (int i = 0; i < items.size(); i++) { for (MTSItemInfo item : items) {
MTSItemInfo item = items.get(i);
addItemInfo(mplew, item.getItem(), true); addItemInfo(mplew, item.getItem(), true);
mplew.writeInt(item.getID()); //id mplew.writeInt(item.getID()); //id
mplew.writeInt(item.getTaxes()); //this + below = price mplew.writeInt(item.getTaxes()); //this + below = price

View File

@@ -21,10 +21,11 @@
*/ */
package tools.data.output; package tools.data.output;
import java.awt.Point;
import java.nio.charset.Charset;
import constants.string.CharsetConstants.MapleLanguageType; import constants.string.CharsetConstants.MapleLanguageType;
import java.awt.*;
import java.nio.charset.Charset;
/** /**
* Provides a generic writer of a little-endian sequence of bytes. * Provides a generic writer of a little-endian sequence of bytes.
* *
@@ -59,8 +60,8 @@ public class GenericLittleEndianWriter implements LittleEndianWriter {
*/ */
@Override @Override
public void write(byte[] b) { public void write(byte[] b) {
for (int x = 0; x < b.length; x++) { for (byte value : b) {
bos.writeByte(b[x]); bos.writeByte(value);
} }
} }