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

14
src/main/java/scripting/AbstractPlayerInteraction.java
View File

@@ -36,7 +36,7 @@ import net.server.world.PartyCharacter;
import scripting.event.EventInstanceManager;
import scripting.event.EventManager;
import scripting.npc.NPCScriptManager;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.MapleMarriage;
import server.expeditions.Expedition;
import server.expeditions.ExpeditionBossLog;
@@ -581,7 +581,7 @@ public class AbstractPlayerInteraction {
evolved.setStance(0);
evolved.setSummoned(true);
evolved.setName(from.getName().compareTo(MapleItemInformationProvider.getInstance().getName(from.getItemId())) != 0 ? from.getName() : MapleItemInformationProvider.getInstance().getName(id));
evolved.setName(from.getName().compareTo(ItemInformationProvider.getInstance().getName(from.getItemId())) != 0 ? from.getName() : ItemInformationProvider.getInstance().getName(id));
evolved.setCloseness(from.getCloseness());
evolved.setFullness(from.getFullness());
evolved.setLevel(from.getLevel());
@@ -592,7 +592,7 @@ public class AbstractPlayerInteraction {
//InventoryManipulator.addById(c, id, (short) 1, null, petId, expires == -1 ? -1 : System.currentTimeMillis() + expires);
}
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
if (ItemConstants.getInventoryType(id).equals(InventoryType.EQUIP)) {
item = ii.getEquipById(id);
@@ -608,7 +608,7 @@ public class AbstractPlayerInteraction {
if(!(c.getPlayer().isGM() && YamlConfig.config.server.USE_PERFECT_GM_SCROLL)) {
eqp.setUpgradeSlots((byte)(eqp.getUpgradeSlots() + 1));
}
item = MapleItemInformationProvider.getInstance().scrollEquipWithId(item, 2049100, true, 2049100, c.getPlayer().isGM());
item = ItemInformationProvider.getInstance().scrollEquipWithId(item, 2049100, true, 2049100, c.getPlayer().isGM());
}
}
} else {
@@ -904,12 +904,12 @@ public class AbstractPlayerInteraction {
}
public void useItem(int id) {
MapleItemInformationProvider.getInstance().getItemEffect(id).applyTo(c.getPlayer());
ItemInformationProvider.getInstance().getItemEffect(id).applyTo(c.getPlayer());
c.sendPacket(PacketCreator.getItemMessage(id));//Useful shet :3
}
public void cancelItem(final int id) {
getPlayer().cancelEffect(MapleItemInformationProvider.getInstance().getItemEffect(id), false, -1);
getPlayer().cancelEffect(ItemInformationProvider.getInstance().getItemEffect(id), false, -1);
}
public void teachSkill(int skillid, byte level, byte masterLevel, long expiration) {
@@ -941,7 +941,7 @@ public class AbstractPlayerInteraction {
if (old != null) {
InventoryManipulator.removeFromSlot(c, InventoryType.EQUIPPED, slot, old.getQuantity(), false, false);
}
final Item newItem = MapleItemInformationProvider.getInstance().getEquipById(itemid);
final Item newItem = ItemInformationProvider.getInstance().getEquipById(itemid);
newItem.setPosition(slot);
c.getPlayer().getInventory(InventoryType.EQUIPPED).addItemFromDB(newItem);
c.sendPacket(PacketCreator.modifyInventory(false, Collections.singletonList(new ModifyInventory(0, newItem))));