Sweetgum/sweetgum-server
1
1
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
src/main/java/scripting/AbstractPlayerInteraction.java
+7 -7
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))));
src/main/java/scripting/event/EventInstanceManager.java
+2 -2
View File
@@ -36,7 +36,7 @@ import net.server.world.Party;
import net.server.world.PartyCharacter;
import scripting.AbstractPlayerInteraction;
import scripting.event.scheduler.EventScriptScheduler;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.MapleStatEffect;
import server.ThreadManager;
import server.TimerManager;
@@ -144,7 +144,7 @@ public class EventInstanceManager {
public void applyEventPlayersItemBuff(int itemId) {
List<Character> players = getPlayerList();
MapleStatEffect mse = MapleItemInformationProvider.getInstance().getItemEffect(itemId);
MapleStatEffect mse = ItemInformationProvider.getInstance().getItemEffect(itemId);
if(mse != null) {
for (Character player: players) {
src/main/java/scripting/item/ItemScriptManager.java
+1 -1
View File
@@ -23,7 +23,7 @@ package scripting.item;
import client.Client;
import scripting.npc.NPCScriptManager;
import server.MapleItemInformationProvider.ScriptedItem;
import server.ItemInformationProvider.ScriptedItem;
public class ItemScriptManager {
src/main/java/scripting/npc/NPCConversationManager.java
+5 -5
View File
@@ -365,7 +365,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
}
public MapleStatEffect getItemEffect(int itemId) {
return MapleItemInformationProvider.getInstance().getItemEffect(itemId);
return ItemInformationProvider.getInstance().getItemEffect(itemId);
}
public void resetStats() {
@@ -532,7 +532,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
}
public boolean itemExists(int itemid) {
return MapleItemInformationProvider.getInstance().getName(itemid) != null;
return ItemInformationProvider.getInstance().getName(itemid) != null;
}
public int getCosmeticItem(int itemid) {
@@ -567,18 +567,18 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
}
public Object[] getAvailableMasteryBooks() {
return MapleItemInformationProvider.getInstance().usableMasteryBooks(this.getPlayer()).toArray();
return ItemInformationProvider.getInstance().usableMasteryBooks(this.getPlayer()).toArray();
}
public Object[] getAvailableSkillBooks() {
List<Integer> ret = MapleItemInformationProvider.getInstance().usableSkillBooks(this.getPlayer());
List<Integer> ret = ItemInformationProvider.getInstance().usableSkillBooks(this.getPlayer());
ret.addAll(MapleSkillbookInformationProvider.getTeachableSkills(this.getPlayer()));
return ret.toArray();
}
public Object[] getNamesWhoDropsItem(Integer itemId) {
return MapleItemInformationProvider.getInstance().getWhoDrops(itemId).toArray();
return ItemInformationProvider.getInstance().getWhoDrops(itemId).toArray();
}
public String getSkillBookInfo(int itemid) {
src/main/java/scripting/npc/NPCScriptManager.java
+1 -1
View File
@@ -25,7 +25,7 @@ import client.Character;
import client.Client;
import net.server.world.PartyCharacter;
import scripting.AbstractScriptManager;
import server.MapleItemInformationProvider.ScriptedItem;
import server.ItemInformationProvider.ScriptedItem;
import tools.FilePrinter;
import tools.PacketCreator;
src/main/java/scripting/quest/QuestActionManager.java
+2 -2
View File
@@ -23,7 +23,7 @@ package scripting.quest;
import client.Client;
import scripting.npc.NPCConversationManager;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.quest.Quest;
import server.quest.actions.ExpAction;
import server.quest.actions.MesoAction;
@@ -85,6 +85,6 @@ public class QuestActionManager extends NPCConversationManager {
public String getMedalName() { // usable only for medal quests (id 299XX)
Quest q = Quest.getInstance(quest);
return MapleItemInformationProvider.getInstance().getName(q.getMedalRequirement());
return ItemInformationProvider.getInstance().getName(q.getMedalRequirement());
}
}
src/main/java/scripting/reactor/ReactorActionManager.java
+4 -4
View File
@@ -29,7 +29,7 @@ import client.inventory.Item;
import config.YamlConfig;
import constants.inventory.ItemConstants;
import scripting.AbstractPlayerInteraction;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.TimerManager;
import server.life.LifeFactory;
import server.life.Monster;
@@ -72,7 +72,7 @@ public class ReactorActionManager extends AbstractPlayerInteraction {
}
private static void sortDropEntries(List<ReactorDropEntry> from, List<ReactorDropEntry> item, List<ReactorDropEntry> visibleQuest, List<ReactorDropEntry> otherQuest, Character chr) {
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
for(ReactorDropEntry mde : from) {
if(!ii.isQuestItem(mde.itemId)) {
@@ -160,7 +160,7 @@ public class ReactorActionManager extends AbstractPlayerInteraction {
final Point dropPos = new Point(posX, posY);
if(!delayed) {
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
byte p = 1;
for (ReactorDropEntry d : items) {
@@ -209,7 +209,7 @@ public class ReactorActionManager extends AbstractPlayerInteraction {
if (ItemConstants.getInventoryType(d.itemId) != InventoryType.EQUIP) {
drop = new Item(d.itemId, (short) 0, (short) 1);
} else {
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
drop = ii.randomizeStats((Equip) ii.getEquipById(d.itemId));
}