From 3434c7334b499af9dfd927224fa37ed41b5f7437 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 8 Apr 2021 17:23:45 +0200 Subject: [PATCH] cleanup: remove redundant cast --- .../client/AbstractMapleCharacterObject.java | 15 ++--- src/main/java/client/MapleClient.java | 2 +- .../java/client/command/CommandsExecutor.java | 24 +++----- .../command/commands/gm6/ShutdownCommand.java | 8 +-- .../java/client/inventory/ItemFactory.java | 2 +- .../java/client/inventory/MapleInventory.java | 4 +- src/main/java/client/inventory/MaplePet.java | 2 +- .../MapleInventoryManipulator.java | 22 +++---- .../processor/stat/AssignSPProcessor.java | 9 ++- .../java/constants/game/GameConstants.java | 28 ++++----- src/main/java/net/MapleServerHandler.java | 2 +- src/main/java/net/server/Server.java | 3 +- src/main/java/net/server/channel/Channel.java | 3 +- .../handlers/AbstractDealDamageHandler.java | 2 +- .../channel/handlers/EnterMTSHandler.java | 10 ++-- .../handlers/InventorySortHandler.java | 26 ++++---- .../server/channel/handlers/MTSHandler.java | 60 +++++++++---------- .../channel/handlers/PetCommandHandler.java | 4 +- .../channel/handlers/RaiseIncExpHandler.java | 8 +-- .../channel/handlers/ScrollHandler.java | 21 +++---- .../channel/handlers/SkillBookHandler.java | 7 ++- .../channel/handlers/TakeDamageHandler.java | 27 +++------ .../java/net/server/services/Service.java | 2 +- src/main/java/net/server/world/World.java | 6 +- src/main/java/provider/wz/WZTool.java | 4 +- .../scripting/AbstractPlayerInteraction.java | 2 +- .../reactor/ReactorActionManager.java | 2 +- src/main/java/server/MapleShop.java | 2 +- src/main/java/server/MapleStatEffect.java | 2 +- .../java/server/MapleStorageInventory.java | 22 +++---- src/main/java/server/life/MapleMonster.java | 2 +- src/main/java/server/life/MobSkill.java | 2 +- .../java/server/maps/MapleHiredMerchant.java | 4 +- src/main/java/server/maps/MapleMap.java | 18 +++--- src/main/java/tools/BCrypt.java | 8 +-- src/main/java/tools/IntervalBuilder.java | 9 +-- src/main/java/tools/MaplePacketCreator.java | 4 +- .../src/provider/wz/WZTool.java | 13 ++-- .../src/provider/wz/WZTool.java | 13 ++-- .../tools/MapleItemInformationProvider.java | 49 +++------------ .../MapleGachaponItemidRetriever.java | 24 ++------ .../src/provider/wz/WZTool.java | 13 ++-- .../src/provider/wz/WZTool.java | 13 ++-- .../src/provider/wz/WZTool.java | 13 ++-- .../tools/MapleItemInformationProvider.java | 47 +++------------ .../src/provider/wz/WZTool.java | 13 ++-- .../src/provider/wz/WZTool.java | 13 ++-- .../src/provider/wz/WZTool.java | 13 ++-- 48 files changed, 243 insertions(+), 359 deletions(-) diff --git a/src/main/java/client/AbstractMapleCharacterObject.java b/src/main/java/client/AbstractMapleCharacterObject.java index e46ebb3bc4..cda953e31a 100644 --- a/src/main/java/client/AbstractMapleCharacterObject.java +++ b/src/main/java/client/AbstractMapleCharacterObject.java @@ -21,10 +21,6 @@ package client; import config.YamlConfig; import constants.game.GameConstants; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.locks.Lock; import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.MonitoredReadLock; import net.server.audit.locks.MonitoredReentrantReadWriteLock; @@ -35,6 +31,11 @@ import net.server.audit.locks.factory.MonitoredWriteLockFactory; import server.maps.AbstractAnimatedMapleMapObject; import server.maps.MapleMap; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.locks.Lock; + /** * * @author RonanLana @@ -315,7 +316,7 @@ public abstract class AbstractMapleCharacterObject extends AbstractAnimatedMaple short newHp = (short) (hpMpPool >> 48); short newMp = (short) (hpMpPool >> 32); short newMaxHp = (short) (hpMpPool >> 16); - short newMaxMp = (short) (hpMpPool.shortValue()); + short newMaxMp = hpMpPool.shortValue(); if (newMaxHp != Short.MIN_VALUE) { if (newMaxHp < 50) { @@ -354,7 +355,7 @@ public abstract class AbstractMapleCharacterObject extends AbstractAnimatedMaple short newStr = (short) (strDexIntLuk >> 48); short newDex = (short) (strDexIntLuk >> 32); short newInt = (short) (strDexIntLuk >> 16); - short newLuk = (short) (strDexIntLuk.shortValue()); + short newLuk = strDexIntLuk.shortValue(); if (newStr >= 4) { setStr(newStr); @@ -386,7 +387,7 @@ public abstract class AbstractMapleCharacterObject extends AbstractAnimatedMaple if (newSp != null) { short sp = (short) (newSp >> 16); - short skillbook = (short) (newSp.shortValue()); + short skillbook = newSp.shortValue(); setRemainingSp(sp, skillbook); statUpdates.put(MapleStat.AVAILABLESP, remainingSp[skillbook]); diff --git a/src/main/java/client/MapleClient.java b/src/main/java/client/MapleClient.java index b04f42fe24..c4342a0a3d 100644 --- a/src/main/java/client/MapleClient.java +++ b/src/main/java/client/MapleClient.java @@ -602,7 +602,7 @@ public class MapleClient { long ipAddress = 0; for (int i = 0; i < 4; i++) { int quad = Integer.parseInt(quads[i]); - ipAddress += (long) (quad % 256) * (long) Math.pow(256, (double) (4 - i)); + ipAddress += (long) (quad % 256) * (long) Math.pow(256, 4 - i); } return ipAddress; } diff --git a/src/main/java/client/command/CommandsExecutor.java b/src/main/java/client/command/CommandsExecutor.java index e30c90adc2..a439dbbcb0 100644 --- a/src/main/java/client/command/CommandsExecutor.java +++ b/src/main/java/client/command/CommandsExecutor.java @@ -23,6 +23,7 @@ */ package client.command; +import client.MapleClient; import client.command.commands.gm0.*; import client.command.commands.gm1.*; import client.command.commands.gm2.*; @@ -30,18 +31,11 @@ import client.command.commands.gm3.*; import client.command.commands.gm4.*; import client.command.commands.gm5.*; import client.command.commands.gm6.*; - -import client.MapleClient; - import tools.FilePrinter; import tools.Pair; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.Arrays; -import java.util.Calendar; -import java.util.HashMap; +import java.util.*; public class CommandsExecutor { @@ -181,7 +175,7 @@ public class CommandsExecutor { } private void registerLv0Commands(){ - levelCommandsCursor = new Pair<>((List) new ArrayList(), (List) new ArrayList()); + levelCommandsCursor = new Pair<>(new ArrayList(), new ArrayList()); addCommand(new String[]{"help", "commands"}, HelpCommand.class); addCommand("droplimit", DropLimitCommand.class); @@ -217,7 +211,7 @@ public class CommandsExecutor { private void registerLv1Commands() { - levelCommandsCursor = new Pair<>((List) new ArrayList(), (List) new ArrayList()); + levelCommandsCursor = new Pair<>(new ArrayList(), new ArrayList()); addCommand("whatdropsfrom", 1, WhatDropsFromCommand.class); addCommand("whodrops", 1, WhoDropsCommand.class); @@ -229,7 +223,7 @@ public class CommandsExecutor { private void registerLv2Commands(){ - levelCommandsCursor = new Pair<>((List) new ArrayList(), (List) new ArrayList()); + levelCommandsCursor = new Pair<>(new ArrayList(), new ArrayList()); addCommand("recharge", 2, RechargeCommand.class); addCommand("whereami", 2, WhereaMiCommand.class); @@ -272,7 +266,7 @@ public class CommandsExecutor { } private void registerLv3Commands() { - levelCommandsCursor = new Pair<>((List) new ArrayList(), (List) new ArrayList()); + levelCommandsCursor = new Pair<>(new ArrayList(), new ArrayList()); addCommand("debuff", 3, DebuffCommand.class); addCommand("fly", 3, FlyCommand.class); @@ -338,7 +332,7 @@ public class CommandsExecutor { } private void registerLv4Commands(){ - levelCommandsCursor = new Pair<>((List) new ArrayList(), (List) new ArrayList()); + levelCommandsCursor = new Pair<>(new ArrayList(), new ArrayList()); addCommand("servermessage", 4, ServerMessageCommand.class); addCommand("proitem", 4, ProItemCommand.class); @@ -369,7 +363,7 @@ public class CommandsExecutor { } private void registerLv5Commands(){ - levelCommandsCursor = new Pair<>((List) new ArrayList(), (List) new ArrayList()); + levelCommandsCursor = new Pair<>(new ArrayList(), new ArrayList()); addCommand("debug", 5, DebugCommand.class); addCommand("set", 5, SetCommand.class); @@ -382,7 +376,7 @@ public class CommandsExecutor { } private void registerLv6Commands(){ - levelCommandsCursor = new Pair<>((List) new ArrayList(), (List) new ArrayList()); + levelCommandsCursor = new Pair<>(new ArrayList(), new ArrayList()); addCommand("setgmlevel", 6, SetGmLevelCommand.class); addCommand("warpworld", 6, WarpWorldCommand.class); diff --git a/src/main/java/client/command/commands/gm6/ShutdownCommand.java b/src/main/java/client/command/commands/gm6/ShutdownCommand.java index 1f7c96b5dc..2f4797b606 100644 --- a/src/main/java/client/command/commands/gm6/ShutdownCommand.java +++ b/src/main/java/client/command/commands/gm6/ShutdownCommand.java @@ -51,10 +51,10 @@ public class ShutdownCommand extends Command { } if (time > 1) { - int seconds = (int) (time / 1000) % 60; - int minutes = (int) ((time / (1000 * 60)) % 60); - int hours = (int) ((time / (1000 * 60 * 60)) % 24); - int days = (int) ((time / (1000 * 60 * 60 * 24))); + int seconds = (time / 1000) % 60; + int minutes = (time / (1000 * 60)) % 60; + int hours = (time / (1000 * 60 * 60)) % 24; + int days = (time / (1000 * 60 * 60 * 24)); String strTime = ""; if (days > 0) strTime += days + " days, "; diff --git a/src/main/java/client/inventory/ItemFactory.java b/src/main/java/client/inventory/ItemFactory.java index 7843d07a90..e6ce4b20c9 100644 --- a/src/main/java/client/inventory/ItemFactory.java +++ b/src/main/java/client/inventory/ItemFactory.java @@ -104,7 +104,7 @@ public enum ItemFactory { equip.setWatk((short) rs.getInt("watk")); equip.setWdef((short) rs.getInt("wdef")); equip.setUpgradeSlots((byte) rs.getInt("upgradeslots")); - equip.setLevel((byte) rs.getByte("level")); + equip.setLevel(rs.getByte("level")); equip.setItemExp(rs.getInt("itemexp")); equip.setItemLevel(rs.getByte("itemlevel")); equip.setExpiration(rs.getLong("expiration")); diff --git a/src/main/java/client/inventory/MapleInventory.java b/src/main/java/client/inventory/MapleInventory.java index b2e756d1df..86be247466 100644 --- a/src/main/java/client/inventory/MapleInventory.java +++ b/src/main/java/client/inventory/MapleInventory.java @@ -232,8 +232,8 @@ public class MapleInventory implements Iterable { public void move(short sSlot, short dSlot, short slotMax) { lock.lock(); try { - Item source = (Item) inventory.get(sSlot); - Item target = (Item) inventory.get(dSlot); + Item source = inventory.get(sSlot); + Item target = inventory.get(dSlot); if (source == null) { return; } diff --git a/src/main/java/client/inventory/MaplePet.java b/src/main/java/client/inventory/MaplePet.java index 8596328df1..e2b3cb8594 100644 --- a/src/main/java/client/inventory/MaplePet.java +++ b/src/main/java/client/inventory/MaplePet.java @@ -306,7 +306,7 @@ public class MaplePet extends Item { for (LifeMovementFragment move : movement) { if (move instanceof LifeMovement) { if (move instanceof AbsoluteLifeMovement) { - this.setPos(((LifeMovement) move).getPosition()); + this.setPos(move.getPosition()); } this.setStance(((LifeMovement) move).getNewstate()); } diff --git a/src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java b/src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java index 2a5be06bf7..5c96e090ae 100644 --- a/src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java +++ b/src/main/java/client/inventory/manipulator/MapleInventoryManipulator.java @@ -24,26 +24,20 @@ package client.inventory.manipulator; import client.MapleBuffStat; import client.MapleCharacter; import client.MapleClient; -import client.inventory.Equip; -import client.inventory.Item; -import client.inventory.MapleInventory; -import client.inventory.MapleInventoryType; -import client.inventory.MaplePet; -import client.inventory.ModifyInventory; +import client.inventory.*; import client.newyear.NewYearCardRecord; import config.YamlConfig; import constants.inventory.ItemConstants; +import server.MapleItemInformationProvider; +import server.maps.MapleMap; +import tools.FilePrinter; +import tools.MaplePacketCreator; -import java.awt.Point; +import java.awt.*; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; -import server.MapleItemInformationProvider; -import server.maps.MapleMap; -import tools.FilePrinter; - -import tools.MaplePacketCreator; /** * @@ -91,7 +85,7 @@ public class MapleInventoryManipulator { Iterator i = existing.iterator(); while (quantity > 0) { if (i.hasNext()) { - Item eItem = (Item) i.next(); + Item eItem = i.next(); short oldQ = eItem.getQuantity(); if (oldQ < slotMax && ((eItem.getOwner().equals(owner) || owner == null) && eItem.getFlag() == flag)) { short newQ = (short) Math.min(oldQ + quantity, slotMax); @@ -202,7 +196,7 @@ public class MapleInventoryManipulator { Iterator i = existing.iterator(); while (quantity > 0) { if (i.hasNext()) { - Item eItem = (Item) i.next(); + Item eItem = i.next(); short oldQ = eItem.getQuantity(); if (oldQ < slotMax && item.getFlag() == eItem.getFlag() && item.getOwner().equals(eItem.getOwner())) { short newQ = (short) Math.min(oldQ + quantity, slotMax); diff --git a/src/main/java/client/processor/stat/AssignSPProcessor.java b/src/main/java/client/processor/stat/AssignSPProcessor.java index fc1cf37870..f6f18cfaa6 100644 --- a/src/main/java/client/processor/stat/AssignSPProcessor.java +++ b/src/main/java/client/processor/stat/AssignSPProcessor.java @@ -30,7 +30,6 @@ import client.SkillFactory; import client.autoban.AutobanFactory; import constants.game.GameConstants; import constants.skills.Aran; -import server.ThreadManager; import tools.FilePrinter; import tools.MaplePacketCreator; @@ -87,12 +86,12 @@ public class AssignSPProcessor { } if (skill.getId() == Aran.FULL_SWING) { player.changeSkillLevel(skill, (byte) (curLevel + 1), player.getMasterLevel(skill), player.getSkillExpiration(skill)); - player.changeSkillLevel(SkillFactory.getSkill(Aran.HIDDEN_FULL_DOUBLE), (byte) player.getSkillLevel(skill), player.getMasterLevel(skill), player.getSkillExpiration(skill)); - player.changeSkillLevel(SkillFactory.getSkill(Aran.HIDDEN_FULL_TRIPLE), (byte) player.getSkillLevel(skill), player.getMasterLevel(skill), player.getSkillExpiration(skill)); + player.changeSkillLevel(SkillFactory.getSkill(Aran.HIDDEN_FULL_DOUBLE), player.getSkillLevel(skill), player.getMasterLevel(skill), player.getSkillExpiration(skill)); + player.changeSkillLevel(SkillFactory.getSkill(Aran.HIDDEN_FULL_TRIPLE), player.getSkillLevel(skill), player.getMasterLevel(skill), player.getSkillExpiration(skill)); } else if (skill.getId() == Aran.OVER_SWING) { player.changeSkillLevel(skill, (byte) (curLevel + 1), player.getMasterLevel(skill), player.getSkillExpiration(skill)); - player.changeSkillLevel(SkillFactory.getSkill(Aran.HIDDEN_OVER_DOUBLE), (byte) player.getSkillLevel(skill), player.getMasterLevel(skill), player.getSkillExpiration(skill)); - player.changeSkillLevel(SkillFactory.getSkill(Aran.HIDDEN_OVER_TRIPLE), (byte) player.getSkillLevel(skill), player.getMasterLevel(skill), player.getSkillExpiration(skill)); + player.changeSkillLevel(SkillFactory.getSkill(Aran.HIDDEN_OVER_DOUBLE), player.getSkillLevel(skill), player.getMasterLevel(skill), player.getSkillExpiration(skill)); + player.changeSkillLevel(SkillFactory.getSkill(Aran.HIDDEN_OVER_TRIPLE), player.getSkillLevel(skill), player.getMasterLevel(skill), player.getSkillExpiration(skill)); } else { player.changeSkillLevel(skill, (byte) (curLevel + 1), player.getMasterLevel(skill), player.getSkillExpiration(skill)); } diff --git a/src/main/java/constants/game/GameConstants.java b/src/main/java/constants/game/GameConstants.java index c74dcbb90c..92e2a3d44b 100644 --- a/src/main/java/constants/game/GameConstants.java +++ b/src/main/java/constants/game/GameConstants.java @@ -1,26 +1,18 @@ package constants.game; import client.MapleDisease; -import java.util.ArrayList; -import java.util.List; -import java.util.HashMap; -import java.util.Map; import client.MapleJob; import config.YamlConfig; import constants.skills.Aran; +import provider.*; +import server.maps.FieldLimit; +import server.maps.MapleMap; +import server.quest.MapleQuest; + import java.io.File; import java.text.DecimalFormat; import java.text.NumberFormat; -import java.util.Locale; -import provider.MapleData; -import provider.MapleDataDirectoryEntry; -import provider.MapleDataFileEntry; -import provider.MapleDataProvider; -import provider.MapleDataProviderFactory; -import provider.MapleDataTool; -import server.maps.MapleMap; -import server.maps.FieldLimit; -import server.quest.MapleQuest; +import java.util.*; /* * @author kevintjuh93 @@ -518,8 +510,8 @@ public class GameConstants { private static boolean isInBranchJobTree(int skillJobId, int jobId, int branchType) { int branch = (int)(Math.pow(10, branchType)); - int skillBranch = (int)(skillJobId / branch) * branch; - int jobBranch = (int)(jobId / branch) * branch; + int skillBranch = (skillJobId / branch) * branch; + int jobBranch = (jobId / branch) * branch; return skillBranch == jobBranch; } @@ -527,8 +519,8 @@ public class GameConstants { private static boolean hasDivergedBranchJobTree(int skillJobId, int jobId, int branchType) { int branch = (int)(Math.pow(10, branchType)); - int skillBranch = (int)(skillJobId / branch); - int jobBranch = (int)(jobId / branch); + int skillBranch = skillJobId / branch; + int jobBranch = jobId / branch; return skillBranch != jobBranch && skillBranch % 10 != 0; } diff --git a/src/main/java/net/MapleServerHandler.java b/src/main/java/net/MapleServerHandler.java index 77c832d6d9..af5654c5c9 100644 --- a/src/main/java/net/MapleServerHandler.java +++ b/src/main/java/net/MapleServerHandler.java @@ -133,7 +133,7 @@ public class MapleServerHandler extends IoHandlerAdapter { ivRecv[3] = (byte) (Math.random() * 255); ivSend[3] = (byte) (Math.random() * 255); MapleAESOFB sendCypher = new MapleAESOFB(ivSend, (short) (0xFFFF - ServerConstants.VERSION)); - MapleAESOFB recvCypher = new MapleAESOFB(ivRecv, (short) ServerConstants.VERSION); + MapleAESOFB recvCypher = new MapleAESOFB(ivRecv, ServerConstants.VERSION); MapleClient client = new MapleClient(sendCypher, recvCypher, session); client.setWorld(world); client.setChannel(channel); diff --git a/src/main/java/net/server/Server.java b/src/main/java/net/server/Server.java index c55c39007f..ff17be07c0 100644 --- a/src/main/java/net/server/Server.java +++ b/src/main/java/net/server/Server.java @@ -54,7 +54,6 @@ import net.server.task.*; import net.server.world.World; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.buffer.SimpleBufferAllocator; -import org.apache.mina.core.filterchain.IoFilter; import org.apache.mina.core.service.IoAcceptor; import org.apache.mina.core.session.IdleStatus; import org.apache.mina.filter.codec.ProtocolCodecFilter; @@ -901,7 +900,7 @@ public class Server { IoBuffer.setUseDirectBuffer(false); // join IO operations performed by lxconan IoBuffer.setAllocator(new SimpleBufferAllocator()); acceptor = new NioSocketAcceptor(); - acceptor.getFilterChain().addLast("codec", (IoFilter) new ProtocolCodecFilter(new MapleCodecFactory())); + acceptor.getFilterChain().addLast("codec", new ProtocolCodecFilter(new MapleCodecFactory())); acceptor.getSessionConfig().setIdleTime(IdleStatus.BOTH_IDLE, 30); acceptor.setHandler(new MapleServerHandler()); try { diff --git a/src/main/java/net/server/channel/Channel.java b/src/main/java/net/server/channel/Channel.java index 0cc3ccf37f..f4f318cc7b 100644 --- a/src/main/java/net/server/channel/Channel.java +++ b/src/main/java/net/server/channel/Channel.java @@ -41,7 +41,6 @@ import net.server.world.MaplePartyCharacter; import net.server.world.World; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.buffer.SimpleBufferAllocator; -import org.apache.mina.core.filterchain.IoFilter; import org.apache.mina.core.service.IoAcceptor; import org.apache.mina.core.session.IdleStatus; import org.apache.mina.filter.codec.ProtocolCodecFilter; @@ -128,7 +127,7 @@ public final class Channel { acceptor = new NioSocketAcceptor(); acceptor.setHandler(new MapleServerHandler(world, channel)); acceptor.getSessionConfig().setIdleTime(IdleStatus.BOTH_IDLE, 30); - acceptor.getFilterChain().addLast("codec", (IoFilter) new ProtocolCodecFilter(new MapleCodecFactory())); + acceptor.getFilterChain().addLast("codec", new ProtocolCodecFilter(new MapleCodecFactory())); acceptor.bind(new InetSocketAddress(port)); ((SocketSessionConfig) acceptor.getSessionConfig()).setTcpNoDelay(true); for (MapleExpeditionType exped : MapleExpeditionType.values()) { diff --git a/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java b/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java index c138702654..dd7e6f998a 100644 --- a/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java @@ -264,7 +264,7 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl else eachdf = eachd; - TimerManager.getInstance().schedule(() -> map.spawnMesoDrop(Math.min((int) Math.max(((double) eachdf / (double) 20000) * (double) maxmeso, (double) 1), maxmeso), new Point((int) (monster.getPosition().getX() + Randomizer.nextInt(100) - 50), (int) (monster.getPosition().getY())), monster, player, true, (byte) 2), delay); + TimerManager.getInstance().schedule(() -> map.spawnMesoDrop(Math.min((int) Math.max(((double) eachdf / (double) 20000) * (double) maxmeso, 1), maxmeso), new Point((int) (monster.getPosition().getX() + Randomizer.nextInt(100) - 50), (int) (monster.getPosition().getY())), monster, player, true, (byte) 2), delay); delay += 100; } } diff --git a/src/main/java/net/server/channel/handlers/EnterMTSHandler.java b/src/main/java/net/server/channel/handlers/EnterMTSHandler.java index 8695b1f714..e6e42a79c5 100644 --- a/src/main/java/net/server/channel/handlers/EnterMTSHandler.java +++ b/src/main/java/net/server/channel/handlers/EnterMTSHandler.java @@ -157,7 +157,7 @@ public final class EnterMTSHandler extends AbstractMaplePacketHandler { equip.setExpiration(rs.getLong("expiration")); equip.setGiftFrom(rs.getString("giftFrom")); - items.add(new MTSItemInfo((Item) equip, rs.getInt("price") + 100 + (int) (rs.getInt("price") * 0.1), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); + items.add(new MTSItemInfo(equip, rs.getInt("price") + 100 + (int) (rs.getInt("price") * 0.1), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); } } } @@ -188,7 +188,7 @@ public final class EnterMTSHandler extends AbstractMaplePacketHandler { if (rs.getInt("type") != 1) { Item i = new Item(rs.getInt("itemid"), (short) 0, (short) rs.getInt("quantity")); i.setOwner(rs.getString("owner")); - items.add(new MTSItemInfo((Item) i, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); + items.add(new MTSItemInfo(i, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); } else { Equip equip = new Equip(rs.getInt("itemid"), (byte) rs.getInt("position"), -1); equip.setOwner(rs.getString("owner")); @@ -217,7 +217,7 @@ public final class EnterMTSHandler extends AbstractMaplePacketHandler { equip.setFlag((short) rs.getInt("flag")); equip.setExpiration(rs.getLong("expiration")); equip.setGiftFrom(rs.getString("giftFrom")); - items.add(new MTSItemInfo((Item) equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); + items.add(new MTSItemInfo(equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); } } } @@ -238,7 +238,7 @@ public final class EnterMTSHandler extends AbstractMaplePacketHandler { if (rs.getInt("type") != 1) { Item i = new Item(rs.getInt("itemid"), (short) 0, (short) rs.getInt("quantity")); i.setOwner(rs.getString("owner")); - items.add(new MTSItemInfo((Item) i, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); + items.add(new MTSItemInfo(i, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); } else { Equip equip = new Equip(rs.getInt("itemid"), (byte) rs.getInt("position"), -1); equip.setOwner(rs.getString("owner")); @@ -267,7 +267,7 @@ public final class EnterMTSHandler extends AbstractMaplePacketHandler { equip.setFlag((short) rs.getInt("flag")); equip.setExpiration(rs.getLong("expiration")); equip.setGiftFrom(rs.getString("giftFrom")); - items.add(new MTSItemInfo((Item) equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); + items.add(new MTSItemInfo(equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); } } } diff --git a/src/main/java/net/server/channel/handlers/InventorySortHandler.java b/src/main/java/net/server/channel/handlers/InventorySortHandler.java index 63b00ba038..b993695db8 100644 --- a/src/main/java/net/server/channel/handlers/InventorySortHandler.java +++ b/src/main/java/net/server/channel/handlers/InventorySortHandler.java @@ -21,22 +21,18 @@ */ package net.server.channel.handlers; -import java.util.ArrayList; -import java.util.List; - -import config.YamlConfig; -import net.AbstractMaplePacketHandler; -import tools.MaplePacketCreator; -import tools.data.input.SeekableLittleEndianAccessor; import client.MapleCharacter; import client.MapleClient; -import client.inventory.Item; -import client.inventory.Equip; -import client.inventory.MapleInventory; -import client.inventory.MapleInventoryType; -import client.inventory.ModifyInventory; -import server.MapleItemInformationProvider; +import client.inventory.*; +import config.YamlConfig; +import net.AbstractMaplePacketHandler; import net.server.Server; +import server.MapleItemInformationProvider; +import tools.MaplePacketCreator; +import tools.data.input.SeekableLittleEndianAccessor; + +import java.util.ArrayList; +import java.util.List; /** * @@ -159,7 +155,7 @@ class PairedQuicksort { if (i <= j) { w = (Equip)A.get(i); A.set(i, A.get(j)); - A.set(j, (Item)w); + A.set(j, w); i++; j--; @@ -290,7 +286,7 @@ public final class InventorySortHandler extends AbstractMaplePacketHandler { for (short i = 1; i <= inventory.getSlotLimit(); i++) { Item item = inventory.getItem(i); if (item != null) { - itemarray.add((Item) item.copy()); + itemarray.add(item.copy()); } } diff --git a/src/main/java/net/server/channel/handlers/MTSHandler.java b/src/main/java/net/server/channel/handlers/MTSHandler.java index 50ca166f63..97fce7ec6c 100644 --- a/src/main/java/net/server/channel/handlers/MTSHandler.java +++ b/src/main/java/net/server/channel/handlers/MTSHandler.java @@ -21,6 +21,23 @@ */ package net.server.channel.handlers; +import client.MapleCharacter; +import client.MapleClient; +import client.inventory.Equip; +import client.inventory.Item; +import client.inventory.MapleInventoryType; +import client.inventory.manipulator.MapleInventoryManipulator; +import constants.inventory.ItemConstants; +import net.AbstractMaplePacketHandler; +import net.server.Server; +import net.server.channel.Channel; +import server.MTSItemInfo; +import server.MapleItemInformationProvider; +import tools.DatabaseConnection; +import tools.MaplePacketCreator; +import tools.Pair; +import tools.data.input.SeekableLittleEndianAccessor; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -29,23 +46,6 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.List; -import net.AbstractMaplePacketHandler; -import net.server.Server; -import net.server.channel.Channel; -import server.MTSItemInfo; -import client.inventory.manipulator.MapleInventoryManipulator; -import server.MapleItemInformationProvider; -import tools.DatabaseConnection; -import tools.MaplePacketCreator; -import tools.Pair; -import tools.data.input.SeekableLittleEndianAccessor; -import client.MapleCharacter; -import client.MapleClient; -import client.inventory.Equip; -import client.inventory.Item; -import client.inventory.MapleInventoryType; -import constants.inventory.ItemConstants; - public final class MTSHandler extends AbstractMaplePacketHandler { @Override @@ -159,10 +159,10 @@ public final class MTSHandler extends AbstractMaplePacketHandler { date += day + ""; } if (!i.getInventoryType().equals(MapleInventoryType.EQUIP)) { - Item item = (Item) i; + Item item = i; ps = con.prepareStatement("INSERT INTO mts_items (tab, type, itemid, quantity, expiration, giftFrom, seller, price, owner, sellername, sell_ends) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); ps.setInt(1, 1); - ps.setInt(2, (int) invType.getType()); + ps.setInt(2, invType.getType()); ps.setInt(3, item.getItemId()); ps.setInt(4, quantity); ps.setLong(5, item.getExpiration()); @@ -176,7 +176,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler { Equip equip = (Equip) i; ps = con.prepareStatement("INSERT INTO mts_items (tab, type, itemid, quantity, expiration, giftFrom, seller, price, upgradeslots, level, str, dex, `int`, luk, hp, mp, watk, matk, wdef, mdef, acc, avoid, hands, speed, jump, locked, owner, sellername, sell_ends, vicious, flag, itemexp, itemlevel, ringid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); ps.setInt(1, 1); - ps.setInt(2, (int) invType.getType()); + ps.setInt(2, invType.getType()); ps.setInt(3, equip.getItemId()); ps.setInt(4, quantity); ps.setLong(5, equip.getExpiration()); @@ -557,7 +557,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler { if (rs.getInt("type") != 1) { Item i = new Item(rs.getInt("itemid"), (byte) 0, (short) rs.getInt("quantity")); i.setOwner(rs.getString("owner")); - items.add(new MTSItemInfo((Item) i, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); + items.add(new MTSItemInfo(i, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); } else { Equip equip = new Equip(rs.getInt("itemid"), (byte) rs.getInt("position"), -1); equip.setOwner(rs.getString("owner")); @@ -586,7 +586,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler { equip.setRingId(rs.getInt("ringid")); equip.setExpiration(rs.getLong("expiration")); equip.setGiftFrom(rs.getString("giftFrom")); - items.add(new MTSItemInfo((Item) equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); + items.add(new MTSItemInfo(equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); } } rs.close(); @@ -617,7 +617,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler { if (rse.getInt("type") != 1) { Item i = new Item(rse.getInt("itemid"), (short) 0, (short) rse.getInt("quantity")); i.setOwner(rse.getString("owner")); - items.add(new MTSItemInfo((Item) i, rse.getInt("price"), rse.getInt("id"), rse.getInt("seller"), rse.getString("sellername"), rse.getString("sell_ends"))); + items.add(new MTSItemInfo(i, rse.getInt("price"), rse.getInt("id"), rse.getInt("seller"), rse.getString("sellername"), rse.getString("sell_ends"))); } else { Equip equip = new Equip(rse.getInt("itemid"), (byte) rse.getInt("position"), -1); equip.setOwner(rse.getString("owner")); @@ -646,7 +646,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler { equip.setFlag((short) rs.getInt("flag")); equip.setExpiration(rs.getLong("expiration")); equip.setGiftFrom(rs.getString("giftFrom")); - items.add(new MTSItemInfo((Item) equip, rse.getInt("price"), rse.getInt("id"), rse.getInt("seller"), rse.getString("sellername"), rse.getString("sell_ends"))); + items.add(new MTSItemInfo(equip, rse.getInt("price"), rse.getInt("id"), rse.getInt("seller"), rse.getString("sellername"), rse.getString("sell_ends"))); } } } @@ -685,7 +685,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler { if (rs.getInt("type") != 1) { Item i = new Item(rs.getInt("itemid"), (short) 0, (short) rs.getInt("quantity")); i.setOwner(rs.getString("owner")); - items.add(new MTSItemInfo((Item) i, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); + items.add(new MTSItemInfo(i, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); } else { Equip equip = new Equip(rs.getInt("itemid"), (byte) rs.getInt("position"), -1); equip.setOwner(rs.getString("owner")); @@ -714,7 +714,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler { equip.setFlag((short) rs.getInt("flag")); equip.setExpiration(rs.getLong("expiration")); equip.setGiftFrom(rs.getString("giftFrom")); - items.add(new MTSItemInfo((Item) equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); + items.add(new MTSItemInfo(equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); } } rs.close(); @@ -751,7 +751,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler { if (rs.getInt("type") != 1) { Item i = new Item(rs.getInt("itemid"), (short) 0, (short) rs.getInt("quantity")); i.setOwner(rs.getString("owner")); - items.add(new MTSItemInfo((Item) i, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); + items.add(new MTSItemInfo(i, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); } else { Equip equip = new Equip(rs.getInt("itemid"), (byte) rs.getInt("position"), -1); equip.setOwner(rs.getString("owner")); @@ -780,7 +780,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler { equip.setFlag((short) rs.getInt("flag")); equip.setExpiration(rs.getLong("expiration")); equip.setGiftFrom(rs.getString("giftFrom")); - items.add(new MTSItemInfo((Item) equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); + items.add(new MTSItemInfo(equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); } } rs.close(); @@ -850,7 +850,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler { if (rs.getInt("type") != 1) { Item i = new Item(rs.getInt("itemid"), (short) 0, (short) rs.getInt("quantity")); i.setOwner(rs.getString("owner")); - items.add(new MTSItemInfo((Item) i, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); + items.add(new MTSItemInfo(i, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); } else { Equip equip = new Equip(rs.getInt("itemid"), (byte) rs.getInt("position"), -1); equip.setOwner(rs.getString("owner")); @@ -879,7 +879,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler { equip.setFlag((short) rs.getInt("flag")); equip.setExpiration(rs.getLong("expiration")); equip.setGiftFrom(rs.getString("giftFrom")); - items.add(new MTSItemInfo((Item) equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); + items.add(new MTSItemInfo(equip, rs.getInt("price"), rs.getInt("id"), rs.getInt("seller"), rs.getString("sellername"), rs.getString("sell_ends"))); } } rs.close(); diff --git a/src/main/java/net/server/channel/handlers/PetCommandHandler.java b/src/main/java/net/server/channel/handlers/PetCommandHandler.java index 40f559b41c..f25768b5a8 100644 --- a/src/main/java/net/server/channel/handlers/PetCommandHandler.java +++ b/src/main/java/net/server/channel/handlers/PetCommandHandler.java @@ -23,9 +23,9 @@ package net.server.channel.handlers; import client.MapleCharacter; import client.MapleClient; +import client.inventory.MaplePet; import client.inventory.PetCommand; import client.inventory.PetDataFactory; -import client.inventory.MaplePet; import net.AbstractMaplePacketHandler; import tools.MaplePacketCreator; import tools.Randomizer; @@ -47,7 +47,7 @@ public final class PetCommandHandler extends AbstractMaplePacketHandler { slea.readInt(); slea.readByte(); byte command = slea.readByte(); - PetCommand petCommand = PetDataFactory.getPetCommand(pet.getItemId(), (int) command); + PetCommand petCommand = PetDataFactory.getPetCommand(pet.getItemId(), command); if (petCommand == null) { return; } diff --git a/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java b/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java index 89c3dd3c2a..b0ad63342a 100644 --- a/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java +++ b/src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java @@ -1,20 +1,20 @@ package net.server.channel.handlers; -import java.util.Map; - import client.MapleCharacter; import client.MapleClient; import client.MapleQuestStatus; import client.inventory.MapleInventory; import client.inventory.MapleInventoryType; -import net.AbstractMaplePacketHandler; import client.inventory.manipulator.MapleInventoryManipulator; +import net.AbstractMaplePacketHandler; import server.MapleItemInformationProvider; import server.MapleItemInformationProvider.QuestConsItem; import server.quest.MapleQuest; import tools.MaplePacketCreator; import tools.data.input.SeekableLittleEndianAccessor; +import java.util.Map; + /** * * @author Xari @@ -55,7 +55,7 @@ public class RaiseIncExpHandler extends AbstractMaplePacketHandler { return; } - MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.getByType(inventorytype), (short) slot, (short) 1, false, true); + MapleInventoryManipulator.removeFromSlot(c, MapleInventoryType.getByType(inventorytype), slot, (short) 1, false, true); } finally { inv.unlockInventory(); } diff --git a/src/main/java/net/server/channel/handlers/ScrollHandler.java b/src/main/java/net/server/channel/handlers/ScrollHandler.java index d485609288..d8b9911855 100644 --- a/src/main/java/net/server/channel/handlers/ScrollHandler.java +++ b/src/main/java/net/server/channel/handlers/ScrollHandler.java @@ -21,26 +21,23 @@ */ package net.server.channel.handlers; -import client.MapleClient; import client.MapleCharacter; +import client.MapleClient; import client.Skill; import client.SkillFactory; -import client.inventory.Equip; +import client.inventory.*; import client.inventory.Equip.ScrollResult; -import client.inventory.Item; -import client.inventory.MapleInventory; -import client.inventory.MapleInventoryType; -import client.inventory.ModifyInventory; -import constants.inventory.ItemConstants; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import net.AbstractMaplePacketHandler; import client.inventory.manipulator.MapleInventoryManipulator; +import constants.inventory.ItemConstants; +import net.AbstractMaplePacketHandler; import server.MapleItemInformationProvider; import tools.MaplePacketCreator; import tools.data.input.SeekableLittleEndianAccessor; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + /** * @author Matze * @author Frz @@ -81,7 +78,7 @@ public final class ScrollHandler extends AbstractMaplePacketHandler { announceCannotScroll(c, legendarySpirit); return; } - } else if (!ItemConstants.isModifierScroll(scroll.getItemId()) && ((Equip) toScroll).getUpgradeSlots() < 1) { + } else if (!ItemConstants.isModifierScroll(scroll.getItemId()) && toScroll.getUpgradeSlots() < 1) { announceCannotScroll(c, legendarySpirit); // thanks onechord for noticing zero upgrade slots freezing Legendary Scroll UI return; } diff --git a/src/main/java/net/server/channel/handlers/SkillBookHandler.java b/src/main/java/net/server/channel/handlers/SkillBookHandler.java index 0fdca86ff1..9ff146ecb6 100644 --- a/src/main/java/net/server/channel/handlers/SkillBookHandler.java +++ b/src/main/java/net/server/channel/handlers/SkillBookHandler.java @@ -28,13 +28,14 @@ import client.SkillFactory; import client.inventory.Item; import client.inventory.MapleInventory; import client.inventory.MapleInventoryType; -import java.util.Map; -import net.AbstractMaplePacketHandler; import client.inventory.manipulator.MapleInventoryManipulator; +import net.AbstractMaplePacketHandler; import server.MapleItemInformationProvider; import tools.MaplePacketCreator; import tools.data.input.SeekableLittleEndianAccessor; +import java.util.Map; + public final class SkillBookHandler extends AbstractMaplePacketHandler { @Override public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { @@ -44,7 +45,7 @@ public final class SkillBookHandler extends AbstractMaplePacketHandler { } slea.readInt(); - short slot = (short) slea.readShort(); + short slot = slea.readShort(); int itemId = slea.readInt(); boolean canuse; diff --git a/src/main/java/net/server/channel/handlers/TakeDamageHandler.java b/src/main/java/net/server/channel/handlers/TakeDamageHandler.java index 488937d6c1..c04a258e18 100644 --- a/src/main/java/net/server/channel/handlers/TakeDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/TakeDamageHandler.java @@ -21,35 +21,21 @@ along with this program. If not, see . */ package net.server.channel.handlers; -import client.MapleBuffStat; -import client.MapleCharacter; -import client.MapleClient; -import client.Skill; -import client.SkillFactory; +import client.*; import client.inventory.Item; import client.inventory.MapleInventory; import client.inventory.MapleInventoryType; +import client.inventory.manipulator.MapleInventoryManipulator; import client.status.MonsterStatus; import client.status.MonsterStatusEffect; import config.YamlConfig; import constants.game.GameConstants; import constants.inventory.ItemConstants; import constants.skills.Aran; - -import java.awt.Point; -import java.util.Collections; -import java.util.ArrayList; -import java.util.List; - import net.AbstractMaplePacketHandler; -import client.inventory.manipulator.MapleInventoryManipulator; import server.MapleStatEffect; import server.life.MapleLifeFactory.loseItem; -import server.life.MapleMonster; -import server.life.MobAttackInfo; -import server.life.MobAttackInfoFactory; -import server.life.MobSkill; -import server.life.MobSkillFactory; +import server.life.*; import server.maps.MapleMap; import server.maps.MapleMapObject; import tools.FilePrinter; @@ -57,6 +43,11 @@ import tools.MaplePacketCreator; import tools.Randomizer; import tools.data.input.SeekableLittleEndianAccessor; +import java.awt.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public final class TakeDamageHandler extends AbstractMaplePacketHandler { @Override @@ -128,7 +119,7 @@ public final class TakeDamageHandler extends AbstractMaplePacketHandler { } for (byte b = 0; b < qty; b++) { - pos.x = (int) (playerpos + ((d % 2 == 0) ? (25 * (d + 1) / 2) : -(25 * (d / 2)))); + pos.x = playerpos + ((d % 2 == 0) ? (25 * (d + 1) / 2) : -(25 * (d / 2))); map.spawnItemDrop(chr, chr, new Item(loseItem.getId(), (short) 0, (short) 1), map.calcDropPos(pos, chr.getPosition()), true, true); d++; } diff --git a/src/main/java/net/server/services/Service.java b/src/main/java/net/server/services/Service.java index b9798d4753..950279e913 100644 --- a/src/main/java/net/server/services/Service.java +++ b/src/main/java/net/server/services/Service.java @@ -31,7 +31,7 @@ public class Service { public Service(Class s) { try { cls = s; - service = (BaseService) cls.getConstructor().newInstance(); + service = cls.getConstructor().newInstance(); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/net/server/world/World.java b/src/main/java/net/server/world/World.java index a17c7abd7a..9cafe04b51 100644 --- a/src/main/java/net/server/world/World.java +++ b/src/main/java/net/server/world/World.java @@ -574,7 +574,7 @@ public class World { public Collection getFamilies() { synchronized(families) { - return Collections.unmodifiableCollection((Collection) families.values()); + return Collections.unmodifiableCollection(families.values()); } } @@ -1832,7 +1832,7 @@ public class World { List itemBundles = hm.sendAvailableBundles(itemid); for(MaplePlayerShopItem mpsi : itemBundles) { - hmsAvailable.add(new Pair<>(mpsi, (AbstractMapleMapObject) hm)); + hmsAvailable.add(new Pair<>(mpsi, hm)); } } @@ -1840,7 +1840,7 @@ public class World { List itemBundles = ps.sendAvailableBundles(itemid); for(MaplePlayerShopItem mpsi : itemBundles) { - hmsAvailable.add(new Pair<>(mpsi, (AbstractMapleMapObject) ps)); + hmsAvailable.add(new Pair<>(mpsi, ps)); } } diff --git a/src/main/java/provider/wz/WZTool.java b/src/main/java/provider/wz/WZTool.java index 2a22496a6c..0fb994052e 100644 --- a/src/main/java/provider/wz/WZTool.java +++ b/src/main/java/provider/wz/WZTool.java @@ -104,7 +104,7 @@ public class WZTool { if (b == 0x7F) { strLength = llea.readInt(); } else { - strLength = (int) b; + strLength = b; } if (strLength < 0) { return ""; @@ -173,7 +173,7 @@ public class WZTool { if (b == -128) { return lea.readInt(); } else { - return ((int) b); + return b; } } diff --git a/src/main/java/scripting/AbstractPlayerInteraction.java b/src/main/java/scripting/AbstractPlayerInteraction.java index b14a68abe0..f7a9b1b84e 100644 --- a/src/main/java/scripting/AbstractPlayerInteraction.java +++ b/src/main/java/scripting/AbstractPlayerInteraction.java @@ -642,7 +642,7 @@ public class AbstractPlayerInteraction { if (randomStats) { MapleInventoryManipulator.addFromDrop(c, ii.randomizeStats((Equip) item), false, petId); } else { - MapleInventoryManipulator.addFromDrop(c, (Equip) item, false, petId); + MapleInventoryManipulator.addFromDrop(c, item, false, petId); } } else { MapleInventoryManipulator.addFromDrop(c, item, false, petId); diff --git a/src/main/java/scripting/reactor/ReactorActionManager.java b/src/main/java/scripting/reactor/ReactorActionManager.java index 9bcb7ab16e..417ea59288 100644 --- a/src/main/java/scripting/reactor/ReactorActionManager.java +++ b/src/main/java/scripting/reactor/ReactorActionManager.java @@ -169,7 +169,7 @@ public class ReactorActionManager extends AbstractPlayerInteraction { byte p = 1; for (ReactorDropEntry d : items) { - dropPos.x = (int) (posX + ((p % 2 == 0) ? (25 * ((p + 1) / 2)) : -(25 * (p / 2)))); + dropPos.x = posX + ((p % 2 == 0) ? (25 * ((p + 1) / 2)) : -(25 * (p / 2))); p++; if (d.itemId == 0) { diff --git a/src/main/java/server/MapleShop.java b/src/main/java/server/MapleShop.java index 11d55cc257..241900da8f 100644 --- a/src/main/java/server/MapleShop.java +++ b/src/main/java/server/MapleShop.java @@ -193,7 +193,7 @@ public class MapleShop { return; } - Item item = c.getPlayer().getInventory(type).getItem((short) slot); + Item item = c.getPlayer().getInventory(type).getItem(slot); if(canSell(item, quantity)) { quantity = getSellingQuantity(item, quantity); MapleInventoryManipulator.removeFromSlot(c, type, (byte) slot, quantity, false); diff --git a/src/main/java/server/MapleStatEffect.java b/src/main/java/server/MapleStatEffect.java index 66a03e47fb..d7aa812cd9 100644 --- a/src/main/java/server/MapleStatEffect.java +++ b/src/main/java/server/MapleStatEffect.java @@ -955,7 +955,7 @@ public class MapleStatEffect { if (projectile == null) { return false; } else { - MapleInventoryManipulator.removeFromSlot(applyto.getClient(), MapleInventoryType.USE, projectile.getPosition(), (short) projectileConsume, false, true); + MapleInventoryManipulator.removeFromSlot(applyto.getClient(), MapleInventoryType.USE, projectile.getPosition(), projectileConsume, false, true); } } finally { use.unlockInventory(); diff --git a/src/main/java/server/MapleStorageInventory.java b/src/main/java/server/MapleStorageInventory.java index 294d9df698..5d7bf2594c 100644 --- a/src/main/java/server/MapleStorageInventory.java +++ b/src/main/java/server/MapleStorageInventory.java @@ -19,19 +19,13 @@ */ package server; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import config.YamlConfig; -import constants.inventory.ItemConstants; - import client.MapleClient; import client.inventory.Equip; import client.inventory.Item; -import java.util.ArrayList; +import config.YamlConfig; +import constants.inventory.ItemConstants; + +import java.util.*; /** * @@ -128,7 +122,7 @@ class PairedQuicksort { if (i <= j) { w = (Equip)A.get(i); A.set(i, A.get(j)); - A.set(j, (Item)w); + A.set(j, w); i++; j--; @@ -221,8 +215,8 @@ public class MapleStorageInventory { } private void move(short sSlot, short dSlot, short slotMax) { - Item source = (Item) inventory.get(sSlot); - Item target = (Item) inventory.get(dSlot); + Item source = inventory.get(sSlot); + Item target = inventory.get(dSlot); if (source == null) { return; } @@ -350,7 +344,7 @@ public class MapleStorageInventory { for (short i = 1; i <= this.getSlotLimit(); i++) { Item item = this.getItem(i); if (item != null) { - itemarray.add((Item) item.copy()); + itemarray.add(item.copy()); } } diff --git a/src/main/java/server/life/MapleMonster.java b/src/main/java/server/life/MapleMonster.java index e8c53bd7b8..05b695e60a 100644 --- a/src/main/java/server/life/MapleMonster.java +++ b/src/main/java/server/life/MapleMonster.java @@ -839,7 +839,7 @@ public class MapleMonster extends AbstractLoadedMapleLife { MapleMap map = m.getMap(); List chrList = map.getAllPlayers(); if (!chrList.isEmpty()) { - MapleCharacter chr = (MapleCharacter) chrList.get(0); + MapleCharacter chr = chrList.get(0); EventInstanceManager eim = map.getEventInstance(); if (eim != null) { diff --git a/src/main/java/server/life/MobSkill.java b/src/main/java/server/life/MobSkill.java index 4a947aebd2..ede0341b2c 100644 --- a/src/main/java/server/life/MobSkill.java +++ b/src/main/java/server/life/MobSkill.java @@ -277,7 +277,7 @@ public class MobSkill { case 8510100: //Pianus bomb if (Math.ceil(Math.random() * 5) == 1) { ypos = 78; - xpos = (int) Randomizer.nextInt(5) + (Randomizer.nextInt(2) == 1 ? 180 : 0); + xpos = Randomizer.nextInt(5) + (Randomizer.nextInt(2) == 1 ? 180 : 0); } else { xpos = (int) (monster.getPosition().getX() + Randomizer.nextInt(1000) - 500); } diff --git a/src/main/java/server/maps/MapleHiredMerchant.java b/src/main/java/server/maps/MapleHiredMerchant.java index a9ff095737..0e1337753b 100644 --- a/src/main/java/server/maps/MapleHiredMerchant.java +++ b/src/main/java/server/maps/MapleHiredMerchant.java @@ -629,9 +629,9 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { short newBundle = pItems.getBundles(); if (shutdown) { //is "shutdown" really necessary? - newItem.setQuantity((short) (pItems.getItem().getQuantity())); + newItem.setQuantity(pItems.getItem().getQuantity()); } else { - newItem.setQuantity((short) (pItems.getItem().getQuantity())); + newItem.setQuantity(pItems.getItem().getQuantity()); } if (newBundle > 0) { itemsWithType.add(new Pair<>(newItem, newItem.getInventoryType())); diff --git a/src/main/java/server/maps/MapleMap.java b/src/main/java/server/maps/MapleMap.java index 00e3a7d8b7..4ee2a80ee7 100644 --- a/src/main/java/server/maps/MapleMap.java +++ b/src/main/java/server/maps/MapleMap.java @@ -597,7 +597,7 @@ public class MapleMap { */ public static String getRoundedCoordinate(double angle) { String[] directions = {"E", "SE", "S", "SW", "W", "NW", "N", "NE", "E"}; - return directions[ (int)Math.round(( ((double)angle % 360) / 45)) ]; + return directions[ (int)Math.round(( (angle % 360) / 45)) ]; } public Pair getDoorPositionStatus(Point pos) { @@ -646,9 +646,9 @@ public class MapleMap { if (Randomizer.nextInt(999999) < dropChance) { if (droptype == 3) { - pos.x = (int) (mobpos + ((d % 2 == 0) ? (40 * ((d + 1) / 2)) : -(40 * (d / 2)))); + pos.x = mobpos + ((d % 2 == 0) ? (40 * ((d + 1) / 2)) : -(40 * (d / 2))); } else { - pos.x = (int) (mobpos + ((d % 2 == 0) ? (25 * ((d + 1) / 2)) : -(25 * (d / 2)))); + pos.x = mobpos + ((d % 2 == 0) ? (25 * ((d + 1) / 2)) : -(25 * (d / 2))); } if (de.itemId == 0) { // meso int mesos = Randomizer.nextInt(de.Maximum - de.Minimum) + de.Minimum; @@ -688,9 +688,9 @@ public class MapleMap { for (final MonsterGlobalDropEntry de : globalEntry) { if (Randomizer.nextInt(999999) < de.chance) { if (droptype == 3) { - pos.x = (int) (mobpos + (d % 2 == 0 ? (40 * (d + 1) / 2) : -(40 * (d / 2)))); + pos.x = mobpos + (d % 2 == 0 ? (40 * (d + 1) / 2) : -(40 * (d / 2))); } else { - pos.x = (int) (mobpos + ((d % 2 == 0) ? (25 * (d + 1) / 2) : -(25 * (d / 2)))); + pos.x = mobpos + ((d % 2 == 0) ? (25 * (d + 1) / 2) : -(25 * (d / 2))); } if (de.itemId != 0) { if (ItemConstants.getInventoryType(de.itemId) == MapleInventoryType.EQUIP) { @@ -890,7 +890,7 @@ public class MapleMap { objectWLock.lock(); try { registerItemDrop(mdrop); - registeredDrops.add(new WeakReference<>((MapleMapObject) mdrop)); + registeredDrops.add(new WeakReference<>(mdrop)); } finally { objectWLock.unlock(); } @@ -1606,13 +1606,13 @@ public class MapleMap { try { for (MapleMapObject o : mapobjects.values()) { if (o.getType() == MapleMapObjectType.REACTOR) { - points.add(((MapleReactor) o).getPosition()); + points.add(o.getPosition()); } } Collections.shuffle(points); for (MapleMapObject o : mapobjects.values()) { if (o.getType() == MapleMapObjectType.REACTOR) { - ((MapleReactor) o).setPosition(points.remove(points.size() - 1)); + o.setPosition(points.remove(points.size() - 1)); } } } finally { @@ -2097,7 +2097,7 @@ public class MapleMap { if (mist.makeChanceResult()) { MapleCharacter chr = (MapleCharacter) mo; if (mist.getOwner().getId() == chr.getId() || mist.getOwner().getParty() != null && mist.getOwner().getParty().containsMembers(chr.getMPC())) { - chr.addMP((int) mist.getSourceSkill().getEffect(chr.getSkillLevel(mist.getSourceSkill().getId())).getX() * chr.getMp() / 100); + chr.addMP(mist.getSourceSkill().getEffect(chr.getSkillLevel(mist.getSourceSkill().getId())).getX() * chr.getMp() / 100); } } } diff --git a/src/main/java/tools/BCrypt.java b/src/main/java/tools/BCrypt.java index 06b1587cf1..774027ef2c 100644 --- a/src/main/java/tools/BCrypt.java +++ b/src/main/java/tools/BCrypt.java @@ -423,7 +423,7 @@ public class BCrypt { if ((int) x < 0 || (int) x > index_64.length) { return -1; } - return index_64[(int) x]; + return index_64[x]; } /** @@ -566,8 +566,8 @@ public class BCrypt { * Initialise the Blowfish key schedule */ private void init_key() { - P = (int[]) P_orig.clone(); - S = (int[]) S_orig.clone(); + P = P_orig.clone(); + S = S_orig.clone(); } /** @@ -797,7 +797,7 @@ public class BCrypt { hashed = B.crypt_raw(passwordb, saltb, rounds, minor == 'x', // true for sign extension bug ('2x') minor == 'a' ? 0x10000 : 0, // safety factor for '2a' - (int[])bf_crypt_ciphertext.clone()); + bf_crypt_ciphertext.clone()); rs.append("$2"); if (minor >= 'a') { diff --git a/src/main/java/tools/IntervalBuilder.java b/src/main/java/tools/IntervalBuilder.java index 0e87949faa..b0d72b6d63 100644 --- a/src/main/java/tools/IntervalBuilder.java +++ b/src/main/java/tools/IntervalBuilder.java @@ -19,9 +19,6 @@ */ package tools; -import java.awt.geom.Line2D; -import java.util.ArrayList; -import java.util.List; import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.MonitoredReadLock; import net.server.audit.locks.MonitoredReentrantReadWriteLock; @@ -29,6 +26,10 @@ import net.server.audit.locks.MonitoredWriteLock; import net.server.audit.locks.factory.MonitoredReadLockFactory; import net.server.audit.locks.factory.MonitoredWriteLockFactory; +import java.awt.geom.Line2D; +import java.util.ArrayList; +import java.util.List; + /** * * @author Ronan @@ -65,7 +66,7 @@ public class IntervalBuilder { newLimitX2 = newTo; } - intervalLimits.add(st, new Line2D.Float((float) newLimitX1, 0, (float) newLimitX2, 0)); + intervalLimits.add(st, new Line2D.Float(newLimitX1, 0, newLimitX2, 0)); } private int bsearchInterval(int point) { diff --git a/src/main/java/tools/MaplePacketCreator.java b/src/main/java/tools/MaplePacketCreator.java index 453d0f571c..453561979c 100644 --- a/src/main/java/tools/MaplePacketCreator.java +++ b/src/main/java/tools/MaplePacketCreator.java @@ -450,9 +450,9 @@ public class MaplePacketCreator { List equippedCash = new ArrayList<>(equippedC.size()); for (Item item : equippedC) { if (item.getPosition() <= -100) { - equippedCash.add((Item) item); + equippedCash.add(item); } else { - equipped.add((Item) item); + equipped.add(item); } } for (Item item : equipped) { // equipped doesn't actually need sorting, thanks Pllsz diff --git a/tools/MapleArrowFetcher/src/provider/wz/WZTool.java b/tools/MapleArrowFetcher/src/provider/wz/WZTool.java index 85e1c8d90b..7f5452cd03 100644 --- a/tools/MapleArrowFetcher/src/provider/wz/WZTool.java +++ b/tools/MapleArrowFetcher/src/provider/wz/WZTool.java @@ -21,15 +21,16 @@ */ package provider.wz; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; +import tools.data.input.LittleEndianAccessor; +import tools.data.input.SeekableLittleEndianAccessor; + import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; import javax.crypto.spec.SecretKeySpec; -import tools.data.input.LittleEndianAccessor; -import tools.data.input.SeekableLittleEndianAccessor; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; /* * Ported Code, see WZFile.java for more info @@ -103,7 +104,7 @@ public class WZTool { if (b == 0x7F) { strLength = llea.readInt(); } else { - strLength = (int) b; + strLength = b; } if (strLength < 0) { return ""; @@ -172,7 +173,7 @@ public class WZTool { if (b == -128) { return lea.readInt(); } else { - return ((int) b); + return b; } } diff --git a/tools/MapleCashCosmeticsFetcher/src/provider/wz/WZTool.java b/tools/MapleCashCosmeticsFetcher/src/provider/wz/WZTool.java index 85e1c8d90b..7f5452cd03 100644 --- a/tools/MapleCashCosmeticsFetcher/src/provider/wz/WZTool.java +++ b/tools/MapleCashCosmeticsFetcher/src/provider/wz/WZTool.java @@ -21,15 +21,16 @@ */ package provider.wz; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; +import tools.data.input.LittleEndianAccessor; +import tools.data.input.SeekableLittleEndianAccessor; + import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; import javax.crypto.spec.SecretKeySpec; -import tools.data.input.LittleEndianAccessor; -import tools.data.input.SeekableLittleEndianAccessor; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; /* * Ported Code, see WZFile.java for more info @@ -103,7 +104,7 @@ public class WZTool { if (b == 0x7F) { strLength = llea.readInt(); } else { - strLength = (int) b; + strLength = b; } if (strLength < 0) { return ""; @@ -172,7 +173,7 @@ public class WZTool { if (b == -128) { return lea.readInt(); } else { - return ((int) b); + return b; } } diff --git a/tools/MapleCashCosmeticsFetcher/src/tools/MapleItemInformationProvider.java b/tools/MapleCashCosmeticsFetcher/src/tools/MapleItemInformationProvider.java index 37addfc389..905459fd8f 100644 --- a/tools/MapleCashCosmeticsFetcher/src/tools/MapleItemInformationProvider.java +++ b/tools/MapleCashCosmeticsFetcher/src/tools/MapleItemInformationProvider.java @@ -21,45 +21,10 @@ */ package tools; -import java.io.File; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import provider.*; -//import net.server.Server; -import provider.MapleData; -import provider.MapleDataDirectoryEntry; -import provider.MapleDataFileEntry; -import provider.MapleDataProvider; -import provider.MapleDataProviderFactory; -import provider.MapleDataTool; -import tools.DatabaseConnection; -//import tools.MaplePacketCreator; -import tools.Pair; -//import client.MapleCharacter; -//import client.MapleClient; -//import client.MapleJob; -//import client.Skill; -//import client.SkillFactory; -//import client.autoban.AutobanFactory; -//import client.inventory.Equip; -//import client.inventory.Item; -//import client.inventory.MapleInventory; -//import client.inventory.MapleInventoryType; -//import client.inventory.MapleWeaponType; -//import constants.ServerConstants; -//import constants.EquipSlot; -//import constants.ItemConstants; -//import constants.skills.Assassin; -//import constants.skills.Gunslinger; -//import constants.skills.NightWalker; -import java.sql.Connection; +import java.io.File; +import java.util.*; //import server.life.MapleMonsterInformationProvider; /** @@ -311,7 +276,7 @@ public class MapleItemInformationProvider { public short getSlotMax(int itemId) { Short slotMax = slotMaxCache.get(itemId); if (slotMax != null) { - return (short)(slotMax); + return slotMax; } short ret = 0; MapleData item = getItemData(itemId); @@ -325,7 +290,7 @@ public class MapleItemInformationProvider { } slotMaxCache.put(itemId, ret); - return (short)(ret); + return ret; } public int getMeso(int itemId) { @@ -378,7 +343,7 @@ public class MapleItemInformationProvider { try { pEntry = MapleDataTool.getDouble(pData); } catch (Exception e) { - pEntry = (double) MapleDataTool.getInt(pData); + pEntry = MapleDataTool.getInt(pData); } } else { pData = item.getChildByPath("info/price"); @@ -386,7 +351,7 @@ public class MapleItemInformationProvider { return -1; } try { - pEntry = (double) MapleDataTool.getInt(pData); + pEntry = MapleDataTool.getInt(pData); } catch(Exception e) { priceCache.put(itemId, 0.0); return 0; diff --git a/tools/MapleGachaponItemidRetriever/src/maplegachaponitemidretriever/MapleGachaponItemidRetriever.java b/tools/MapleGachaponItemidRetriever/src/maplegachaponitemidretriever/MapleGachaponItemidRetriever.java index b490a31156..d260ce33d2 100644 --- a/tools/MapleGachaponItemidRetriever/src/maplegachaponitemidretriever/MapleGachaponItemidRetriever.java +++ b/tools/MapleGachaponItemidRetriever/src/maplegachaponitemidretriever/MapleGachaponItemidRetriever.java @@ -19,25 +19,9 @@ */ package maplegachaponitemidretriever; -import java.util.ArrayList; -import java.util.List; -import java.util.LinkedList; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; - -import java.io.BufferedReader; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.PrintWriter; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Collections; +import java.io.*; +import java.sql.*; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -168,7 +152,7 @@ public class MapleGachaponItemidRetriever { @Override public int hashCode() { - int result = (int) (prop ^ (prop >>> 32)); + int result = prop ^ (prop >>> 32); result = 31 * result + (header != null ? header.hashCode() : 0); result = 31 * result + (target != null ? target.hashCode() : 0); result = 31 * result + (buff != null ? buff.hashCode() : 0); diff --git a/tools/MapleInvalidItemWithNoNameFetcher/src/provider/wz/WZTool.java b/tools/MapleInvalidItemWithNoNameFetcher/src/provider/wz/WZTool.java index 85e1c8d90b..7f5452cd03 100644 --- a/tools/MapleInvalidItemWithNoNameFetcher/src/provider/wz/WZTool.java +++ b/tools/MapleInvalidItemWithNoNameFetcher/src/provider/wz/WZTool.java @@ -21,15 +21,16 @@ */ package provider.wz; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; +import tools.data.input.LittleEndianAccessor; +import tools.data.input.SeekableLittleEndianAccessor; + import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; import javax.crypto.spec.SecretKeySpec; -import tools.data.input.LittleEndianAccessor; -import tools.data.input.SeekableLittleEndianAccessor; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; /* * Ported Code, see WZFile.java for more info @@ -103,7 +104,7 @@ public class WZTool { if (b == 0x7F) { strLength = llea.readInt(); } else { - strLength = (int) b; + strLength = b; } if (strLength < 0) { return ""; @@ -172,7 +173,7 @@ public class WZTool { if (b == -128) { return lea.readInt(); } else { - return ((int) b); + return b; } } diff --git a/tools/MapleMesoFetcher/src/provider/wz/WZTool.java b/tools/MapleMesoFetcher/src/provider/wz/WZTool.java index 85e1c8d90b..7f5452cd03 100644 --- a/tools/MapleMesoFetcher/src/provider/wz/WZTool.java +++ b/tools/MapleMesoFetcher/src/provider/wz/WZTool.java @@ -21,15 +21,16 @@ */ package provider.wz; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; +import tools.data.input.LittleEndianAccessor; +import tools.data.input.SeekableLittleEndianAccessor; + import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; import javax.crypto.spec.SecretKeySpec; -import tools.data.input.LittleEndianAccessor; -import tools.data.input.SeekableLittleEndianAccessor; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; /* * Ported Code, see WZFile.java for more info @@ -103,7 +104,7 @@ public class WZTool { if (b == 0x7F) { strLength = llea.readInt(); } else { - strLength = (int) b; + strLength = b; } if (strLength < 0) { return ""; @@ -172,7 +173,7 @@ public class WZTool { if (b == -128) { return lea.readInt(); } else { - return ((int) b); + return b; } } diff --git a/tools/MapleQuestItemFetcher/src/provider/wz/WZTool.java b/tools/MapleQuestItemFetcher/src/provider/wz/WZTool.java index 85e1c8d90b..7f5452cd03 100644 --- a/tools/MapleQuestItemFetcher/src/provider/wz/WZTool.java +++ b/tools/MapleQuestItemFetcher/src/provider/wz/WZTool.java @@ -21,15 +21,16 @@ */ package provider.wz; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; +import tools.data.input.LittleEndianAccessor; +import tools.data.input.SeekableLittleEndianAccessor; + import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; import javax.crypto.spec.SecretKeySpec; -import tools.data.input.LittleEndianAccessor; -import tools.data.input.SeekableLittleEndianAccessor; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; /* * Ported Code, see WZFile.java for more info @@ -103,7 +104,7 @@ public class WZTool { if (b == 0x7F) { strLength = llea.readInt(); } else { - strLength = (int) b; + strLength = b; } if (strLength < 0) { return ""; @@ -172,7 +173,7 @@ public class WZTool { if (b == -128) { return lea.readInt(); } else { - return ((int) b); + return b; } } diff --git a/tools/MapleQuestItemFetcher/src/tools/MapleItemInformationProvider.java b/tools/MapleQuestItemFetcher/src/tools/MapleItemInformationProvider.java index 30136be234..ec7519db34 100644 --- a/tools/MapleQuestItemFetcher/src/tools/MapleItemInformationProvider.java +++ b/tools/MapleQuestItemFetcher/src/tools/MapleItemInformationProvider.java @@ -21,45 +21,14 @@ */ package tools; +import provider.*; + import java.io.File; +import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -//import net.server.Server; -import provider.MapleData; -import provider.MapleDataDirectoryEntry; -import provider.MapleDataFileEntry; -import provider.MapleDataProvider; -import provider.MapleDataProviderFactory; -import provider.MapleDataTool; -import tools.DatabaseConnection; -//import tools.MaplePacketCreator; -import tools.Pair; -//import client.MapleCharacter; -//import client.MapleClient; -//import client.MapleJob; -//import client.Skill; -//import client.SkillFactory; -//import client.autoban.AutobanFactory; -//import client.inventory.Equip; -//import client.inventory.Item; -//import client.inventory.MapleInventory; -//import client.inventory.MapleInventoryType; -//import client.inventory.MapleWeaponType; -//import constants.ServerConstants; -//import constants.EquipSlot; -//import constants.ItemConstants; -//import constants.skills.Assassin; -//import constants.skills.Gunslinger; -//import constants.skills.NightWalker; -import java.sql.Connection; +import java.util.*; //import server.life.MapleMonsterInformationProvider; /** @@ -313,7 +282,7 @@ public class MapleItemInformationProvider { public short getSlotMax(int itemId) { Short slotMax = slotMaxCache.get(itemId); if (slotMax != null) { - return (short)(slotMax); + return slotMax; } short ret = 0; MapleData item = getItemData(itemId); @@ -327,7 +296,7 @@ public class MapleItemInformationProvider { } slotMaxCache.put(itemId, ret); - return (short)(ret); + return ret; } public int getMeso(int itemId) { @@ -380,7 +349,7 @@ public class MapleItemInformationProvider { try { pEntry = MapleDataTool.getDouble(pData); } catch (Exception e) { - pEntry = (double) MapleDataTool.getInt(pData); + pEntry = MapleDataTool.getInt(pData); } } else { pData = item.getChildByPath("info/price"); @@ -388,7 +357,7 @@ public class MapleItemInformationProvider { return -1; } try { - pEntry = (double) MapleDataTool.getInt(pData); + pEntry = MapleDataTool.getInt(pData); } catch(Exception e) { priceCache.put(itemId, 0.0); return 0; diff --git a/tools/MapleSkillMakerFetcher/src/provider/wz/WZTool.java b/tools/MapleSkillMakerFetcher/src/provider/wz/WZTool.java index 85e1c8d90b..7f5452cd03 100644 --- a/tools/MapleSkillMakerFetcher/src/provider/wz/WZTool.java +++ b/tools/MapleSkillMakerFetcher/src/provider/wz/WZTool.java @@ -21,15 +21,16 @@ */ package provider.wz; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; +import tools.data.input.LittleEndianAccessor; +import tools.data.input.SeekableLittleEndianAccessor; + import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; import javax.crypto.spec.SecretKeySpec; -import tools.data.input.LittleEndianAccessor; -import tools.data.input.SeekableLittleEndianAccessor; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; /* * Ported Code, see WZFile.java for more info @@ -103,7 +104,7 @@ public class WZTool { if (b == 0x7F) { strLength = llea.readInt(); } else { - strLength = (int) b; + strLength = b; } if (strLength < 0) { return ""; @@ -172,7 +173,7 @@ public class WZTool { if (b == -128) { return lea.readInt(); } else { - return ((int) b); + return b; } } diff --git a/tools/MapleSkillbookChanceFetcher/src/provider/wz/WZTool.java b/tools/MapleSkillbookChanceFetcher/src/provider/wz/WZTool.java index 85e1c8d90b..7f5452cd03 100644 --- a/tools/MapleSkillbookChanceFetcher/src/provider/wz/WZTool.java +++ b/tools/MapleSkillbookChanceFetcher/src/provider/wz/WZTool.java @@ -21,15 +21,16 @@ */ package provider.wz; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; +import tools.data.input.LittleEndianAccessor; +import tools.data.input.SeekableLittleEndianAccessor; + import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; import javax.crypto.spec.SecretKeySpec; -import tools.data.input.LittleEndianAccessor; -import tools.data.input.SeekableLittleEndianAccessor; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; /* * Ported Code, see WZFile.java for more info @@ -103,7 +104,7 @@ public class WZTool { if (b == 0x7F) { strLength = llea.readInt(); } else { - strLength = (int) b; + strLength = b; } if (strLength < 0) { return ""; @@ -172,7 +173,7 @@ public class WZTool { if (b == -128) { return lea.readInt(); } else { - return ((int) b); + return b; } } diff --git a/tools/SpiderDropFetcher/src/provider/wz/WZTool.java b/tools/SpiderDropFetcher/src/provider/wz/WZTool.java index 85e1c8d90b..7f5452cd03 100644 --- a/tools/SpiderDropFetcher/src/provider/wz/WZTool.java +++ b/tools/SpiderDropFetcher/src/provider/wz/WZTool.java @@ -21,15 +21,16 @@ */ package provider.wz; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; +import tools.data.input.LittleEndianAccessor; +import tools.data.input.SeekableLittleEndianAccessor; + import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; import javax.crypto.spec.SecretKeySpec; -import tools.data.input.LittleEndianAccessor; -import tools.data.input.SeekableLittleEndianAccessor; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; /* * Ported Code, see WZFile.java for more info @@ -103,7 +104,7 @@ public class WZTool { if (b == 0x7F) { strLength = llea.readInt(); } else { - strLength = (int) b; + strLength = b; } if (strLength < 0) { return ""; @@ -172,7 +173,7 @@ public class WZTool { if (b == -128) { return lea.readInt(); } else { - return ((int) b); + return b; } }