From 2acf2ed83d7192350bf99270384ac90464f46c4f Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 22:06:55 +0200 Subject: [PATCH] Rename and clean up MapleMonsterInformationProvider --- .../command/commands/gm1/WhatDropsFromCommand.java | 8 ++++---- .../client/command/commands/gm1/WhoDropsCommand.java | 4 ++-- .../command/commands/gm3/ReloadDropsCommand.java | 4 ++-- .../channel/handlers/AbstractDealDamageHandler.java | 2 +- .../server/channel/handlers/FieldDamageMobHandler.java | 4 ++-- .../server/channel/handlers/MobDamageMobHandler.java | 4 ++-- .../net/server/channel/handlers/MoveLifeHandler.java | 4 ++-- .../server/channel/handlers/SummonDamageHandler.java | 4 ++-- src/main/java/server/MapleItemInformationProvider.java | 4 ++-- src/main/java/server/life/LifeFactory.java | 4 ++-- src/main/java/server/life/Monster.java | 8 ++++---- ...onProvider.java => MonsterInformationProvider.java} | 10 +++++----- src/main/java/server/loot/MapleLootManager.java | 4 ++-- src/main/java/server/maps/MapleMap.java | 4 ++-- 14 files changed, 34 insertions(+), 34 deletions(-) rename src/main/java/server/life/{MapleMonsterInformationProvider.java => MonsterInformationProvider.java} (97%) diff --git a/src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java b/src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java index 07590d3d3f..5ecc53bc1a 100644 --- a/src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java +++ b/src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java @@ -27,8 +27,8 @@ import client.Character; import client.Client; import client.command.Command; import server.MapleItemInformationProvider; -import server.life.MapleMonsterInformationProvider; import server.life.MonsterDropEntry; +import server.life.MonsterInformationProvider; import tools.Pair; import java.util.Iterator; @@ -48,20 +48,20 @@ public class WhatDropsFromCommand extends Command { String monsterName = player.getLastCommandMessage(); String output = ""; int limit = 3; - Iterator> listIterator = MapleMonsterInformationProvider.getMobsIDsFromName(monsterName).iterator(); + Iterator> listIterator = MonsterInformationProvider.getMobsIDsFromName(monsterName).iterator(); for (int i = 0; i < limit; i++) { if(listIterator.hasNext()) { Pair data = listIterator.next(); int mobId = data.getLeft(); String mobName = data.getRight(); output += mobName + " drops the following items:\r\n\r\n"; - for (MonsterDropEntry drop : MapleMonsterInformationProvider.getInstance().retrieveDrop(mobId)){ + for (MonsterDropEntry drop : MonsterInformationProvider.getInstance().retrieveDrop(mobId)){ try { String name = MapleItemInformationProvider.getInstance().getName(drop.itemId); if (name == null || name.equals("null") || drop.chance == 0){ continue; } - float chance = Math.max(1000000 / drop.chance / (!MapleMonsterInformationProvider.getInstance().isBoss(mobId) ? player.getDropRate() : player.getBossDropRate()), 1); + float chance = Math.max(1000000 / drop.chance / (!MonsterInformationProvider.getInstance().isBoss(mobId) ? player.getDropRate() : player.getBossDropRate()), 1); output += "- " + name + " (1/" + (int) chance + ")\r\n"; } catch (Exception ex){ ex.printStackTrace(); diff --git a/src/main/java/client/command/commands/gm1/WhoDropsCommand.java b/src/main/java/client/command/commands/gm1/WhoDropsCommand.java index 52a41220e4..b75955f58f 100644 --- a/src/main/java/client/command/commands/gm1/WhoDropsCommand.java +++ b/src/main/java/client/command/commands/gm1/WhoDropsCommand.java @@ -27,7 +27,7 @@ import client.Character; import client.Client; import client.command.Command; import server.MapleItemInformationProvider; -import server.life.MapleMonsterInformationProvider; +import server.life.MonsterInformationProvider; import tools.DatabaseConnection; import tools.Pair; @@ -65,7 +65,7 @@ public class WhoDropsCommand extends Command { try (ResultSet rs = ps.executeQuery()) { while (rs.next()) { - String resultName = MapleMonsterInformationProvider.getInstance().getMobNameFromId(rs.getInt("dropperid")); + String resultName = MonsterInformationProvider.getInstance().getMobNameFromId(rs.getInt("dropperid")); if (resultName != null) { output += resultName + ", "; } diff --git a/src/main/java/client/command/commands/gm3/ReloadDropsCommand.java b/src/main/java/client/command/commands/gm3/ReloadDropsCommand.java index 14b484cd70..da88d321b8 100644 --- a/src/main/java/client/command/commands/gm3/ReloadDropsCommand.java +++ b/src/main/java/client/command/commands/gm3/ReloadDropsCommand.java @@ -26,7 +26,7 @@ package client.command.commands.gm3; import client.Character; import client.Client; import client.command.Command; -import server.life.MapleMonsterInformationProvider; +import server.life.MonsterInformationProvider; public class ReloadDropsCommand extends Command { { @@ -36,7 +36,7 @@ public class ReloadDropsCommand extends Command { @Override public void execute(Client c, String[] params) { Character player = c.getPlayer(); - MapleMonsterInformationProvider.getInstance().clearDrops(); + MonsterInformationProvider.getInstance().clearDrops(); player.dropMessage(5, "Reloaded Drops"); } } diff --git a/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java b/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java index 42278b2ec4..09145bb1a5 100644 --- a/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java @@ -278,7 +278,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler { if (steal.getEffect(player.getSkillLevel(steal)).makeChanceResult()) { monster.addStolen(0); - MapleMonsterInformationProvider mi = MapleMonsterInformationProvider.getInstance(); + MonsterInformationProvider mi = MonsterInformationProvider.getInstance(); List dropPool = mi.retrieveDropPool(monster.getId()); if(!dropPool.isEmpty()) { int rndPool = (int) Math.floor(Math.random() * dropPool.get(dropPool.size() - 1)); diff --git a/src/main/java/net/server/channel/handlers/FieldDamageMobHandler.java b/src/main/java/net/server/channel/handlers/FieldDamageMobHandler.java index 4da39ebe39..801ca12d82 100644 --- a/src/main/java/net/server/channel/handlers/FieldDamageMobHandler.java +++ b/src/main/java/net/server/channel/handlers/FieldDamageMobHandler.java @@ -24,8 +24,8 @@ import client.Client; import constants.game.GameConstants; import net.AbstractPacketHandler; import net.packet.InPacket; -import server.life.MapleMonsterInformationProvider; import server.life.Monster; +import server.life.MonsterInformationProvider; import server.maps.MapleMap; import tools.FilePrinter; import tools.PacketCreator; @@ -48,7 +48,7 @@ public class FieldDamageMobHandler extends AbstractPacketHandler { Monster mob = map.getMonsterByOid(mobOid); if (mob != null) { if (dmg < 0 || dmg > GameConstants.MAX_FIELD_MOB_DAMAGE) { - FilePrinter.printError(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " tried to use an obstacle on mapid " + map.getId() + " to attack " + MapleMonsterInformationProvider.getInstance().getMobNameFromId(mob.getId()) + " with damage " + dmg); + FilePrinter.printError(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " tried to use an obstacle on mapid " + map.getId() + " to attack " + MonsterInformationProvider.getInstance().getMobNameFromId(mob.getId()) + " with damage " + dmg); return; } diff --git a/src/main/java/net/server/channel/handlers/MobDamageMobHandler.java b/src/main/java/net/server/channel/handlers/MobDamageMobHandler.java index 9d9ef5cfd9..6609f56dc9 100644 --- a/src/main/java/net/server/channel/handlers/MobDamageMobHandler.java +++ b/src/main/java/net/server/channel/handlers/MobDamageMobHandler.java @@ -28,8 +28,8 @@ import client.status.MonsterStatus; import client.status.MonsterStatusEffect; import net.AbstractPacketHandler; import net.packet.InPacket; -import server.life.MapleMonsterInformationProvider; import server.life.Monster; +import server.life.MonsterInformationProvider; import server.maps.MapleMap; import tools.FilePrinter; import tools.PacketCreator; @@ -61,7 +61,7 @@ public final class MobDamageMobHandler extends AbstractPacketHandler { if (dmg > maxDmg) { AutobanFactory.DAMAGE_HACK.alert(c.getPlayer(), "Possible packet editing hypnotize damage exploit."); // thanks Rien dev team - FilePrinter.printError(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " had hypnotized " + MapleMonsterInformationProvider.getInstance().getMobNameFromId(attacker.getId()) + " to attack " + MapleMonsterInformationProvider.getInstance().getMobNameFromId(damaged.getId()) + " with damage " + dmg + " (max: " + maxDmg + ")"); + FilePrinter.printError(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " had hypnotized " + MonsterInformationProvider.getInstance().getMobNameFromId(attacker.getId()) + " to attack " + MonsterInformationProvider.getInstance().getMobNameFromId(damaged.getId()) + " with damage " + dmg + " (max: " + maxDmg + ")"); dmg = maxDmg; } diff --git a/src/main/java/net/server/channel/handlers/MoveLifeHandler.java b/src/main/java/net/server/channel/handlers/MoveLifeHandler.java index 4b9a9307cc..dd78e87713 100644 --- a/src/main/java/net/server/channel/handlers/MoveLifeHandler.java +++ b/src/main/java/net/server/channel/handlers/MoveLifeHandler.java @@ -25,10 +25,10 @@ import client.Character; import client.Client; import config.YamlConfig; import net.packet.InPacket; -import server.life.MapleMonsterInformationProvider; import server.life.MobSkill; import server.life.MobSkillFactory; import server.life.Monster; +import server.life.MonsterInformationProvider; import server.maps.MapleMap; import server.maps.MapleMapObject; import server.maps.MapleMapObjectType; @@ -99,7 +99,7 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler { toUse = MobSkillFactory.getMobSkill(useSkillId, useSkillLevel); if (monster.canUseSkill(toUse, true)) { - int animationTime = MapleMonsterInformationProvider.getInstance().getMobSkillAnimationTime(toUse); + int animationTime = MonsterInformationProvider.getInstance().getMobSkillAnimationTime(toUse); if(animationTime > 0 && toUse.getSkillId() != 129) { toUse.applyDelayedEffect(player, monster, true, animationTime); } else { diff --git a/src/main/java/net/server/channel/handlers/SummonDamageHandler.java b/src/main/java/net/server/channel/handlers/SummonDamageHandler.java index 8af1c8dfbd..a478d53385 100644 --- a/src/main/java/net/server/channel/handlers/SummonDamageHandler.java +++ b/src/main/java/net/server/channel/handlers/SummonDamageHandler.java @@ -34,8 +34,8 @@ import constants.skills.Outlaw; import net.packet.InPacket; import server.MapleItemInformationProvider; import server.MapleStatEffect; -import server.life.MapleMonsterInformationProvider; import server.life.Monster; +import server.life.MonsterInformationProvider; import server.maps.MapleSummon; import tools.FilePrinter; import tools.PacketCreator; @@ -109,7 +109,7 @@ public final class SummonDamageHandler extends AbstractDealDamageHandler { if (damage > maxDmg) { AutobanFactory.DAMAGE_HACK.alert(c.getPlayer(), "Possible packet editing summon damage exploit."); - FilePrinter.printError(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " used a summon of skillid " + summon.getSkill() + " to attack " + MapleMonsterInformationProvider.getInstance().getMobNameFromId(target.getId()) + " with damage " + damage + " (max: " + maxDmg + ")"); + FilePrinter.printError(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " used a summon of skillid " + summon.getSkill() + " to attack " + MonsterInformationProvider.getInstance().getMobNameFromId(target.getId()) + " with damage " + damage + " (max: " + maxDmg + ")"); damage = maxDmg; } diff --git a/src/main/java/server/MapleItemInformationProvider.java b/src/main/java/server/MapleItemInformationProvider.java index feb57e1100..386c5f0cce 100644 --- a/src/main/java/server/MapleItemInformationProvider.java +++ b/src/main/java/server/MapleItemInformationProvider.java @@ -36,7 +36,7 @@ import provider.*; import provider.wz.WZFiles; import server.MakerItemFactory.MakerItemCreateEntry; import server.life.LifeFactory; -import server.life.MapleMonsterInformationProvider; +import server.life.MonsterInformationProvider; import tools.*; import java.sql.Connection; @@ -2059,7 +2059,7 @@ public class MapleItemInformationProvider { try (ResultSet rs = ps.executeQuery()) { while (rs.next()) { - String resultName = MapleMonsterInformationProvider.getInstance().getMobNameFromId(rs.getInt("dropperid")); + String resultName = MonsterInformationProvider.getInstance().getMobNameFromId(rs.getInt("dropperid")); if (!resultName.isEmpty()) { list.add(resultName); } diff --git a/src/main/java/server/life/LifeFactory.java b/src/main/java/server/life/LifeFactory.java index 4ad35efcc8..274b62da9a 100644 --- a/src/main/java/server/life/LifeFactory.java +++ b/src/main/java/server/life/LifeFactory.java @@ -80,7 +80,7 @@ public class LifeFactory { private static void setMonsterAttackInfo(int mid, List attackInfos) { if (!attackInfos.isEmpty()) { - MapleMonsterInformationProvider mi = MapleMonsterInformationProvider.getInstance(); + MonsterInformationProvider mi = MonsterInformationProvider.getInstance(); for (MobAttackInfoHolder attackInfo : attackInfos) { mi.setMobAttackInfo(mid, attackInfo.attackPos, attackInfo.mpCon, attackInfo.coolTime); @@ -181,7 +181,7 @@ public class LifeFactory { } decodeElementalString(stats, DataTool.getString("elemAttr", monsterInfoData, "")); - MapleMonsterInformationProvider mi = MapleMonsterInformationProvider.getInstance(); + MonsterInformationProvider mi = MonsterInformationProvider.getInstance(); Data monsterSkillInfoData = monsterInfoData.getChildByPath("skill"); if (monsterSkillInfoData != null) { int i = 0; diff --git a/src/main/java/server/life/Monster.java b/src/main/java/server/life/Monster.java index cc00db8ba0..90b289fba2 100644 --- a/src/main/java/server/life/Monster.java +++ b/src/main/java/server/life/Monster.java @@ -314,9 +314,9 @@ public class Monster extends AbstractLoadedLife { long animationTime; if (skill == null) { - animationTime = MapleMonsterInformationProvider.getInstance().getMobAttackAnimationTime(this.getId(), attackPos); + animationTime = MonsterInformationProvider.getInstance().getMobAttackAnimationTime(this.getId(), attackPos); } else { - animationTime = MapleMonsterInformationProvider.getInstance().getMobSkillAnimationTime(skill); + animationTime = MonsterInformationProvider.getInstance().getMobSkillAnimationTime(skill); } if (animationTime > 0) { @@ -738,7 +738,7 @@ public class Monster extends AbstractLoadedLife { public List retrieveRelevantDrops() { if (this.getStats().isFriendly()) { // thanks Conrad for noticing friendly mobs not spawning loots after a recent update - return MapleMonsterInformationProvider.getInstance().retrieveEffectiveDrop(this.getId()); + return MonsterInformationProvider.getInstance().retrieveEffectiveDrop(this.getId()); } Map pchars = map.getMapAllPlayers(); @@ -1542,7 +1542,7 @@ public class Monster extends AbstractLoadedLife { } */ - Pair attackInfo = MapleMonsterInformationProvider.getInstance().getMobAttackInfo(this.getId(), attackPos); + Pair attackInfo = MonsterInformationProvider.getInstance().getMobAttackInfo(this.getId(), attackPos); if (attackInfo == null) { return -1; } diff --git a/src/main/java/server/life/MapleMonsterInformationProvider.java b/src/main/java/server/life/MonsterInformationProvider.java similarity index 97% rename from src/main/java/server/life/MapleMonsterInformationProvider.java rename to src/main/java/server/life/MonsterInformationProvider.java index 12a581b505..1f16ddabc9 100644 --- a/src/main/java/server/life/MapleMonsterInformationProvider.java +++ b/src/main/java/server/life/MonsterInformationProvider.java @@ -38,12 +38,12 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.*; -public class MapleMonsterInformationProvider { +public class MonsterInformationProvider { // Author : LightPepsi - private static final MapleMonsterInformationProvider instance = new MapleMonsterInformationProvider(); + private static final MonsterInformationProvider instance = new MonsterInformationProvider(); - public static MapleMonsterInformationProvider getInstance() { + public static MonsterInformationProvider getInstance() { return instance; } @@ -63,7 +63,7 @@ public class MapleMonsterInformationProvider { private final Map mobBossCache = new HashMap<>(); private final Map mobNameCache = new HashMap<>(); - protected MapleMonsterInformationProvider() { + protected MonsterInformationProvider() { retrieveGlobal(); } @@ -269,7 +269,7 @@ public class MapleMonsterInformationProvider { if (mobName == null) { DataProvider dataProvider = DataProviderFactory.getDataProvider(WZFiles.STRING); Data mobData = dataProvider.getData("Mob.img"); - + mobName = DataTool.getString(mobData.getChildByPath(id + "/name"), ""); mobNameCache.put(id, mobName); } diff --git a/src/main/java/server/loot/MapleLootManager.java b/src/main/java/server/loot/MapleLootManager.java index 289e37c98f..ec536dcbb2 100644 --- a/src/main/java/server/loot/MapleLootManager.java +++ b/src/main/java/server/loot/MapleLootManager.java @@ -20,8 +20,8 @@ package server.loot; import client.Character; -import server.life.MapleMonsterInformationProvider; import server.life.MonsterDropEntry; +import server.life.MonsterInformationProvider; import server.quest.MapleQuest; import java.util.LinkedList; @@ -74,7 +74,7 @@ public class MapleLootManager { } public static List retrieveRelevantDrops(int monsterId, List players) { - List loots = MapleMonsterInformationProvider.getInstance().retrieveEffectiveDrop(monsterId); + List loots = MonsterInformationProvider.getInstance().retrieveEffectiveDrop(monsterId); if(loots.isEmpty()) return loots; List playersInv = new LinkedList<>(); diff --git a/src/main/java/server/maps/MapleMap.java b/src/main/java/server/maps/MapleMap.java index 905c13821b..9dbe209b06 100644 --- a/src/main/java/server/maps/MapleMap.java +++ b/src/main/java/server/maps/MapleMap.java @@ -721,7 +721,7 @@ public class MapleMap { chRate = 1; } - final MapleMonsterInformationProvider mi = MapleMonsterInformationProvider.getInstance(); + final MonsterInformationProvider mi = MonsterInformationProvider.getInstance(); final List globalEntry = mi.getRelevantGlobalDrops(this.getId()); final List dropEntry = new ArrayList<>(); @@ -2793,7 +2793,7 @@ public class MapleMap { } if (monster.isBoss()) { if (unclaimOwnership() != null) { - String mobName = MapleMonsterInformationProvider.getInstance().getMobNameFromId(monster.getId()); + String mobName = MonsterInformationProvider.getInstance().getMobNameFromId(monster.getId()); if (mobName != null) { mobName = mobName.trim(); this.dropMessage(5, "This lawn has been taken siege by " + mobName + "'s forces and will be kept hold until their defeat.");