Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleItemInformationProvider

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:45:55 +02:00
parent 8f54b3e5de
commit 9c8abf6f62
81 changed files with 545 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/server/channel/handlers/AdminCommandHandler.java
View File

@@ -28,7 +28,7 @@ import client.inventory.InventoryType;
import client.inventory.manipulator.InventoryManipulator;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.life.LifeFactory;
import server.life.Monster;
import server.maps.MapObject;
@@ -52,7 +52,7 @@ public final class AdminCommandHandler extends AbstractPacketHandler {
Character target;
switch (mode) {
case 0x00: // Level1~Level8 & Package1~Package2
int[][] toSpawn = MapleItemInformationProvider.getInstance().getSummonMobs(p.readInt());
int[][] toSpawn = ItemInformationProvider.getInstance().getSummonMobs(p.readInt());
for (int[] toSpawnChild : toSpawn) {
if (Randomizer.nextInt(100) < toSpawnChild[1]) {
c.getPlayer().getMap().spawnMonsterOnGroundBelow(LifeFactory.getMonster(toSpawnChild[0]), c.getPlayer().getPosition());

4
src/main/java/net/server/channel/handlers/CancelItemEffectHandler.java
View File

@@ -24,14 +24,14 @@ package net.server.channel.handlers;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
public final class CancelItemEffectHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, Client c) {
int itemId = -p.readInt();
if (MapleItemInformationProvider.getInstance().noCancelMouse(itemId)) {
if (ItemInformationProvider.getInstance().noCancelMouse(itemId)) {
return;
}
c.getPlayer().cancelEffect(itemId);

4
src/main/java/net/server/channel/handlers/CashOperationHandler.java
View File

@@ -37,7 +37,7 @@ import net.server.Server;
import server.CashShop;
import server.CashShop.CashItem;
import server.CashShop.CashItemFactory;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import tools.FilePrinter;
import tools.PacketCreator;
import tools.Pair;
@@ -484,7 +484,7 @@ public final class CashOperationHandler extends AbstractPacketHandler {
private static boolean canBuy(Character chr, CashItem item, int cash) {
if (item != null && item.isOnSale() && item.getPrice() <= cash) {
FilePrinter.print(FilePrinter.CASHITEM_BOUGHT, chr + " bought " + MapleItemInformationProvider.getInstance().getName(item.getItemId()) + " (SN " + item.getSN() + ") for " + item.getPrice());
FilePrinter.print(FilePrinter.CASHITEM_BOUGHT, chr + " bought " + ItemInformationProvider.getInstance().getName(item.getItemId()) + " (SN " + item.getSN() + ") for " + item.getPrice());
return true;
} else {
return false;

6
src/main/java/net/server/channel/handlers/CouponCodeHandler.java
View File

@@ -31,7 +31,7 @@ import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
import server.CashShop;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import tools.DatabaseConnection;
import tools.FilePrinter;
import tools.PacketCreator;
@@ -87,7 +87,7 @@ public final class CouponCodeHandler extends AbstractPacketHandler {
for (Entry<Integer, Integer> e : couponItems.entrySet()) {
int item = e.getKey(), qty = e.getValue();
if (MapleItemInformationProvider.getInstance().getName(item) == null) {
if (ItemInformationProvider.getInstance().getName(item) == null) {
item = 4000000;
qty = 1;
@@ -238,7 +238,7 @@ public final class CouponCodeHandler extends AbstractPacketHandler {
qty = (short) quantity;
}
if (MapleItemInformationProvider.getInstance().isCash(item)) {
if (ItemInformationProvider.getInstance().isCash(item)) {
Item it = CashShop.generateCouponItem(item, qty);
cs.addToInventory(it);

4
src/main/java/net/server/channel/handlers/InventoryMergeHandler.java
View File

@@ -31,7 +31,7 @@ import config.YamlConfig;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import tools.PacketCreator;
public final class InventoryMergeHandler extends AbstractPacketHandler {
@@ -59,7 +59,7 @@ public final class InventoryMergeHandler extends AbstractPacketHandler {
try {
//------------------- RonanLana's SLOT MERGER -----------------
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
Item srcItem, dstItem;
for(short dst = 1; dst <= inventory.getSlotLimit(); dst++) {

4
src/main/java/net/server/channel/handlers/InventorySortHandler.java
View File

@@ -28,7 +28,7 @@ import config.YamlConfig;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import tools.PacketCreator;
import java.util.ArrayList;
@@ -44,7 +44,7 @@ class PairedQuicksort {
private int i = 0;
private int j = 0;
private final ArrayList<Integer> intersect;
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
private void PartitionByItemId(int Esq, int Dir, ArrayList<Item> A) {
Item x, w;

6
src/main/java/net/server/channel/handlers/ItemRewardHandler.java
View File

@@ -29,8 +29,8 @@ import constants.inventory.ItemConstants;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
import server.MapleItemInformationProvider;
import server.MapleItemInformationProvider.RewardItem;
import server.ItemInformationProvider;
import server.ItemInformationProvider.RewardItem;
import tools.PacketCreator;
import tools.Pair;
import tools.Randomizer;
@@ -50,7 +50,7 @@ public final class ItemRewardHandler extends AbstractPacketHandler {
Item it = c.getPlayer().getInventory(InventoryType.USE).getItem(slot); // null check here thanks to Thora
if (it == null || it.getItemId() != itemId || c.getPlayer().getInventory(InventoryType.USE).countById(itemId) < 1) return;
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
Pair<Integer, List<RewardItem>> rewards = ii.getItemReward(itemId);
for (RewardItem reward : rewards.getRight()) {
if (!InventoryManipulator.checkSpace(c, reward.itemid, reward.quantity, "")) {

4
src/main/java/net/server/channel/handlers/MTSHandler.java
View File

@@ -33,8 +33,8 @@ import net.packet.InPacket;
import net.packet.Packet;
import net.server.Server;
import net.server.channel.Channel;
import server.ItemInformationProvider;
import server.MTSItemInfo;
import server.MapleItemInformationProvider;
import tools.DatabaseConnection;
import tools.PacketCreator;
import tools.Pair;
@@ -809,7 +809,7 @@ public final class MTSHandler extends AbstractPacketHandler {
public Packet getMTSSearch(int tab, int type, int cOi, String search, int page) {
List<MTSItemInfo> items = new ArrayList<>();
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
String listaitems = "";
if (cOi != 0) {
List<String> retItems = new ArrayList<>();

4
src/main/java/net/server/channel/handlers/PetAutoPotHandler.java
View File

@@ -26,7 +26,7 @@ import client.Client;
import client.processor.action.PetAutopotProcessor;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.MapleStatEffect;
public final class PetAutoPotHandler extends AbstractPacketHandler {
@@ -40,7 +40,7 @@ public final class PetAutoPotHandler extends AbstractPacketHandler {
int itemId = p.readInt();
Character chr = c.getPlayer();
MapleStatEffect stat = MapleItemInformationProvider.getInstance().getItemEffect(itemId);
MapleStatEffect stat = ItemInformationProvider.getInstance().getItemEffect(itemId);
if (stat.getHp() > 0 || stat.getHpRate() > 0.0) {
float estimatedHp = ((float) chr.getHp()) / chr.getMaxHp();
chr.setAutopotHpAlert(estimatedHp + 0.05f);

6
src/main/java/net/server/channel/handlers/PlayerInteractionHandler.java
View File

@@ -34,7 +34,7 @@ import constants.game.GameConstants;
import constants.inventory.ItemConstants;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.MapleTrade;
import server.maps.*;
import server.maps.MiniGame.MiniGameType;
@@ -471,7 +471,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
} else if (mode == Action.SET_MESO.getCode()) {
chr.getTrade().setMeso(p.readInt());
} else if (mode == Action.SET_ITEMS.getCode()) {
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
InventoryType ivType = InventoryType.getByType(p.readByte());
short pos = p.readShort();
Item item = chr.getInventory(ivType).getItem(pos);
@@ -565,7 +565,7 @@ public final class PlayerInteractionHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.serverNotice(1, "Could not perform shop operation with that item."));
c.sendPacket(PacketCreator.enableActions());
return;
} else if (MapleItemInformationProvider.getInstance().isUnmerchable(ivItem.getItemId())) {
} else if (ItemInformationProvider.getInstance().isUnmerchable(ivItem.getItemId())) {
if (ItemConstants.isPet(ivItem.getItemId())) {
c.sendPacket(PacketCreator.serverNotice(1, "Pets are not allowed to be sold on the Player Store."));
} else {

6
src/main/java/net/server/channel/handlers/RaiseIncExpHandler.java
View File

@@ -8,8 +8,8 @@ import client.inventory.InventoryType;
import client.inventory.manipulator.InventoryManipulator;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.MapleItemInformationProvider;
import server.MapleItemInformationProvider.QuestConsItem;
import server.ItemInformationProvider;
import server.ItemInformationProvider.QuestConsItem;
import server.quest.Quest;
import tools.PacketCreator;
@@ -30,7 +30,7 @@ public class RaiseIncExpHandler extends AbstractPacketHandler {
if (c.tryacquireClient()) {
try {
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
QuestConsItem consItem = ii.getQuestConsumablesInfo(itemid);
if (consItem == null) {
return;

4
src/main/java/net/server/channel/handlers/RangedAttackHandler.java
View File

@@ -34,7 +34,7 @@ import constants.inventory.ItemConstants;
import constants.skills.*;
import net.packet.InPacket;
import net.packet.Packet;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.MapleStatEffect;
import tools.PacketCreator;
import tools.Randomizer;
@@ -91,7 +91,7 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler {
}
} else {
Item weapon = chr.getInventory(InventoryType.EQUIPPED).getItem((short) -11);
WeaponType type = MapleItemInformationProvider.getInstance().getWeaponType(weapon.getItemId());
WeaponType type = ItemInformationProvider.getInstance().getWeaponType(weapon.getItemId());
if (type == WeaponType.NOT_A_WEAPON) {
return;
}

4
src/main/java/net/server/channel/handlers/RingActionHandler.java
View File

@@ -34,7 +34,7 @@ import net.packet.InPacket;
import net.server.channel.Channel;
import net.server.world.World;
import scripting.event.EventInstanceManager;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import tools.DatabaseConnection;
import tools.PacketCreator;
import tools.Pair;
@@ -273,7 +273,7 @@ public final class RingActionHandler extends AbstractPacketHandler {
public static void giveMarriageRings(Character player, Character partner, int marriageRingId) {
Pair<Integer, Integer> rings = Ring.createRing(marriageRingId, player, partner);
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
Item ringObj = ii.getEquipById(marriageRingId);
Equip ringEqp = (Equip) ringObj;

6
src/main/java/net/server/channel/handlers/ScriptedItemHandler.java
View File

@@ -27,8 +27,8 @@ import constants.inventory.ItemConstants;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import scripting.item.ItemScriptManager;
import server.MapleItemInformationProvider;
import server.MapleItemInformationProvider.ScriptedItem;
import server.ItemInformationProvider;
import server.ItemInformationProvider.ScriptedItem;
/**
*
@@ -41,7 +41,7 @@ public final class ScriptedItemHandler extends AbstractPacketHandler {
short itemSlot = p.readShort(); // item slot, thanks RMZero213
int itemId = p.readInt();
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
ScriptedItem info = ii.getScriptedItemInfo(itemId);
if (info == null) return;

4
src/main/java/net/server/channel/handlers/ScrollHandler.java
View File

@@ -31,7 +31,7 @@ import client.inventory.manipulator.InventoryManipulator;
import constants.inventory.ItemConstants;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import tools.PacketCreator;
import java.util.ArrayList;
@@ -58,7 +58,7 @@ public final class ScrollHandler extends AbstractPacketHandler {
whiteScroll = true;
}
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
Character chr = c.getPlayer();
Equip toScroll = (Equip) chr.getInventory(InventoryType.EQUIPPED).getItem(dst);
Skill LegendarySpirit = SkillFactory.getSkill(1003);

6
src/main/java/net/server/channel/handlers/SkillBookHandler.java
View File

@@ -31,7 +31,7 @@ import client.inventory.Item;
import client.inventory.manipulator.InventoryManipulator;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import tools.PacketCreator;
import java.util.Map;
@@ -61,7 +61,7 @@ public final class SkillBookHandler extends AbstractPacketHandler {
if (toUse == null || toUse.getItemId() != itemId) {
return;
}
Map<String, Integer> skilldata = MapleItemInformationProvider.getInstance().getSkillStats(toUse.getItemId(), c.getPlayer().getJob().getId());
Map<String, Integer> skilldata = ItemInformationProvider.getInstance().getSkillStats(toUse.getItemId(), c.getPlayer().getJob().getId());
if (skilldata == null) {
return;
}
@@ -82,7 +82,7 @@ public final class SkillBookHandler extends AbstractPacketHandler {
}
canuse = true;
if (MapleItemInformationProvider.rollSuccessChance(skilldata.get("success"))) {
if (ItemInformationProvider.rollSuccessChance(skilldata.get("success"))) {
success = true;
player.changeSkillLevel(skill2, player.getSkillLevel(skill2), Math.max(skilldata.get("masterLevel"), player.getMasterLevel(skill2)), -1);
} else {

4
src/main/java/net/server/channel/handlers/SummonDamageHandler.java
View File

@@ -32,7 +32,7 @@ import client.inventory.WeaponType;
import client.status.MonsterStatusEffect;
import constants.skills.Outlaw;
import net.packet.InPacket;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.MapleStatEffect;
import server.life.Monster;
import server.life.MonsterInformationProvider;
@@ -139,7 +139,7 @@ public final class SummonDamageHandler extends AbstractDealDamageHandler {
int maxBaseDmg; // thanks Conrad, Atoot for detecting some summons legitimately hitting over the calculated limit
if (weapon_item != null) {
maxBaseDmg = player.calculateMaxBaseDamage(watk, MapleItemInformationProvider.getInstance().getWeaponType(weapon_item.getItemId()));
maxBaseDmg = player.calculateMaxBaseDamage(watk, ItemInformationProvider.getInstance().getWeaponType(weapon_item.getItemId()));
} else {
maxBaseDmg = player.calculateMaxBaseDamage(watk, WeaponType.SWORD1H);
}

4
src/main/java/net/server/channel/handlers/UseCashItemHandler.java
View File

@@ -37,7 +37,7 @@ import constants.inventory.ItemConstants;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.MapleShop;
import server.MapleShopFactory;
import server.TimerManager;
@@ -64,7 +64,7 @@ public final class UseCashItemHandler extends AbstractPacketHandler {
}
player.setLastUsedCashItem(timeNow);
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
short position = p.readShort();
int itemId = p.readInt();
int itemType = itemId / 10000;

4
src/main/java/net/server/channel/handlers/UseCatchItemHandler.java
View File

@@ -30,7 +30,7 @@ import constants.inventory.ItemConstants;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.life.Monster;
import tools.PacketCreator;
@@ -189,7 +189,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler {
default:
// proper Fish catch, thanks to Dragohe4rt
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
int itemGanho = ii.getCreateItem(itemId);
int mobItem = ii.getMobItem(itemId);

4
src/main/java/net/server/channel/handlers/UseItemHandler.java
View File

@@ -31,7 +31,7 @@ import config.YamlConfig;
import constants.inventory.ItemConstants;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.MapleStatEffect;
import tools.PacketCreator;
@@ -47,7 +47,7 @@ public final class UseItemHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.enableActions());
return;
}
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
p.readInt();
short slot = p.readShort();
int itemId = p.readInt();

4
src/main/java/net/server/channel/handlers/UseSolomonHandler.java
View File

@@ -29,7 +29,7 @@ import client.inventory.Item;
import client.inventory.manipulator.InventoryManipulator;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import tools.PacketCreator;
/**
@@ -45,7 +45,7 @@ public final class UseSolomonHandler extends AbstractPacketHandler {
p.readInt();
short slot = p.readShort();
int itemId = p.readInt();
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
if (c.tryacquireClient()) {
try {

4
src/main/java/net/server/channel/handlers/UseSummonBagHandler.java
View File

@@ -27,7 +27,7 @@ import client.inventory.Item;
import client.inventory.manipulator.InventoryManipulator;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.life.LifeFactory;
import tools.PacketCreator;
import tools.Randomizer;
@@ -51,7 +51,7 @@ public final class UseSummonBagHandler extends AbstractPacketHandler {
Item toUse = c.getPlayer().getInventory(InventoryType.USE).getItem(slot);
if (toUse != null && toUse.getQuantity() > 0 && toUse.getItemId() == itemId) {
InventoryManipulator.removeFromSlot(c, InventoryType.USE, slot, (short) 1, false);
int[][] toSpawn = MapleItemInformationProvider.getInstance().getSummonMobs(itemId);
int[][] toSpawn = ItemInformationProvider.getInstance().getSummonMobs(itemId);
for (int[] toSpawnChild : toSpawn) {
if (Randomizer.nextInt(100) < toSpawnChild[1]) {
c.getPlayer().getMap().spawnMonsterOnGroundBelow(LifeFactory.getMonster(toSpawnChild[0]), c.getPlayer().getPosition());