From a5b42b8a43e45cdc7d8eec8d170b71b1db8eb06c Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 8 Apr 2021 17:45:50 +0200 Subject: [PATCH] cleanup: use primitive type instead of wrapper type --- .../client/command/commands/gm3/CheckDmgCommand.java | 2 +- src/main/java/client/inventory/Equip.java | 11 ++++++----- src/main/java/net/server/Server.java | 2 +- .../channel/handlers/AbstractDealDamageHandler.java | 4 ++-- src/main/java/net/server/world/World.java | 2 +- src/main/java/server/maps/MapleMap.java | 2 +- src/main/java/server/partyquest/AriantColiseum.java | 2 +- .../maplecouponinstaller/MapleCouponInstaller.java | 4 ++-- .../MapleGachaponItemidRetriever.java | 4 ++-- .../src/mapleidretriever/MapleIdRetriever.java | 10 +++------- 10 files changed, 20 insertions(+), 23 deletions(-) diff --git a/src/main/java/client/command/commands/gm3/CheckDmgCommand.java b/src/main/java/client/command/commands/gm3/CheckDmgCommand.java index 4545443dc5..1f7ad273c5 100644 --- a/src/main/java/client/command/commands/gm3/CheckDmgCommand.java +++ b/src/main/java/client/command/commands/gm3/CheckDmgCommand.java @@ -41,7 +41,7 @@ public class CheckDmgCommand extends Command { int maxBase = victim.calculateMaxBaseDamage(victim.getTotalWatk()); Integer watkBuff = victim.getBuffedValue(MapleBuffStat.WATK); Integer matkBuff = victim.getBuffedValue(MapleBuffStat.MATK); - Integer blessing = victim.getSkillLevel(10000000 * player.getJobType() + 12); + int blessing = victim.getSkillLevel(10000000 * player.getJobType() + 12); if (watkBuff == null) watkBuff = 0; if (matkBuff == null) matkBuff = 0; diff --git a/src/main/java/client/inventory/Equip.java b/src/main/java/client/inventory/Equip.java index 91036d9287..c2a821cddc 100644 --- a/src/main/java/client/inventory/Equip.java +++ b/src/main/java/client/inventory/Equip.java @@ -25,15 +25,16 @@ import client.MapleClient; import config.YamlConfig; import constants.game.ExpTable; import constants.inventory.ItemConstants; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; import server.MapleItemInformationProvider; import tools.MaplePacketCreator; import tools.Pair; import tools.Randomizer; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + public class Equip extends Item { public static enum ScrollResult { @@ -383,7 +384,7 @@ public class Equip extends Item { public Pair> gainStats(List> stats) { boolean gotSlot = false, gotVicious = false; String lvupStr = ""; - Integer statUp, maxStat = YamlConfig.config.server.MAX_EQUIPMNT_STAT; + int statUp, maxStat = YamlConfig.config.server.MAX_EQUIPMNT_STAT; for (Pair stat : stats) { switch (stat.getLeft()) { case incDEX: diff --git a/src/main/java/net/server/Server.java b/src/main/java/net/server/Server.java index 726015de1e..7b674b1b7f 100644 --- a/src/main/java/net/server/Server.java +++ b/src/main/java/net/server/Server.java @@ -873,7 +873,7 @@ public class Server { } try { - Integer worldCount = Math.min(GameConstants.WORLD_NAMES.length, YamlConfig.config.server.WORLDS); + int worldCount = Math.min(GameConstants.WORLD_NAMES.length, YamlConfig.config.server.WORLDS); for (int i = 0; i < worldCount; i++) { initWorld(); diff --git a/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java b/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java index dd7e6f998a..ec6a15d2e4 100644 --- a/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java @@ -258,7 +258,7 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl eachd += Integer.MAX_VALUE; if (pickpocket.getEffect(picklv).makeChanceResult()) { - final Integer eachdf; + final int eachdf; if(eachd < 0) eachdf = eachd + Integer.MAX_VALUE; else @@ -280,7 +280,7 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl MapleMonsterInformationProvider mi = MapleMonsterInformationProvider.getInstance(); List dropPool = mi.retrieveDropPool(monster.getId()); if(!dropPool.isEmpty()) { - Integer rndPool = (int) Math.floor(Math.random() * dropPool.get(dropPool.size() - 1)); + int rndPool = (int) Math.floor(Math.random() * dropPool.get(dropPool.size() - 1)); int i = 0; while(rndPool >= dropPool.get(i)) i++; diff --git a/src/main/java/net/server/world/World.java b/src/main/java/net/server/world/World.java index bc9e974f05..7fb78eb2fe 100644 --- a/src/main/java/net/server/world/World.java +++ b/src/main/java/net/server/world/World.java @@ -1445,7 +1445,7 @@ public class World { MapleCharacter chr = this.getPlayerStorage().getCharacterById(dp.getKey() / 4); if(chr == null || !chr.isLoggedinWorld()) continue; - Integer dpVal = dp.getValue() + 1; + int dpVal = dp.getValue() + 1; if(dpVal == YamlConfig.config.server.PET_EXHAUST_COUNT) { chr.runFullnessSchedule(dp.getKey() % 4); dpVal = 0; diff --git a/src/main/java/server/maps/MapleMap.java b/src/main/java/server/maps/MapleMap.java index 4ee2a80ee7..135f5753d2 100644 --- a/src/main/java/server/maps/MapleMap.java +++ b/src/main/java/server/maps/MapleMap.java @@ -447,7 +447,7 @@ public class MapleMap { private int getUsableOID() { objectRLock.lock(); try { - Integer curOid; + int curOid; // clashes with playernpc on curOid >= 2147000000, developernpc uses >= 2147483000 do { diff --git a/src/main/java/server/partyquest/AriantColiseum.java b/src/main/java/server/partyquest/AriantColiseum.java index 432213d359..0b08f79b3d 100644 --- a/src/main/java/server/partyquest/AriantColiseum.java +++ b/src/main/java/server/partyquest/AriantColiseum.java @@ -220,7 +220,7 @@ public class AriantColiseum { } public void distributeAriantPoints() { - Integer firstTop = -1, secondTop = -1; + int firstTop = -1, secondTop = -1; MapleCharacter winner = null; List runnerups = new ArrayList<>(); diff --git a/tools/MapleCouponInstaller/src/maplecouponinstaller/MapleCouponInstaller.java b/tools/MapleCouponInstaller/src/maplecouponinstaller/MapleCouponInstaller.java index 659a48550b..c646398bb1 100644 --- a/tools/MapleCouponInstaller/src/maplecouponinstaller/MapleCouponInstaller.java +++ b/tools/MapleCouponInstaller/src/maplecouponinstaller/MapleCouponInstaller.java @@ -221,8 +221,8 @@ public class MapleCouponInstaller { if(d.contains("rate")) { String r = getNodeValue(token); - Double db = Double.parseDouble(r); - itemMultiplier = db.intValue(); + double db = Double.parseDouble(r); + itemMultiplier = (int) db; } } } diff --git a/tools/MapleGachaponItemidRetriever/src/maplegachaponitemidretriever/MapleGachaponItemidRetriever.java b/tools/MapleGachaponItemidRetriever/src/maplegachaponitemidretriever/MapleGachaponItemidRetriever.java index d260ce33d2..c539bd4f52 100644 --- a/tools/MapleGachaponItemidRetriever/src/maplegachaponitemidretriever/MapleGachaponItemidRetriever.java +++ b/tools/MapleGachaponItemidRetriever/src/maplegachaponitemidretriever/MapleGachaponItemidRetriever.java @@ -238,9 +238,9 @@ public class MapleGachaponItemidRetriever { ResultSet rs = ps.executeQuery(); while(rs.next()) { - Integer id = rs.getInt("id"); + int id = rs.getInt("id"); - str += id.toString(); + str += Integer.toString(id); str += " "; } diff --git a/tools/MapleIdRetriever/src/mapleidretriever/MapleIdRetriever.java b/tools/MapleIdRetriever/src/mapleidretriever/MapleIdRetriever.java index 7ac88eb733..e723de2ac0 100644 --- a/tools/MapleIdRetriever/src/mapleidretriever/MapleIdRetriever.java +++ b/tools/MapleIdRetriever/src/mapleidretriever/MapleIdRetriever.java @@ -20,11 +20,7 @@ package mapleidretriever; import java.io.*; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; +import java.sql.*; import java.util.ArrayList; /** @@ -175,9 +171,9 @@ public class MapleIdRetriever { String str = ""; while(rs.next()) { - Integer id = rs.getInt("id"); + int id = rs.getInt("id"); - str += id.toString(); + str += Integer.toString(id); str += " "; }