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/server/quest/actions/BuffAction.java
View File

@@ -24,7 +24,7 @@ package server.quest.actions;
import client.Character;
import provider.Data;
import provider.DataTool;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.quest.Quest;
import server.quest.QuestActionType;
@@ -52,6 +52,6 @@ public class BuffAction extends MapleQuestAction {
@Override
public void run(Character chr, Integer extSelection) {
MapleItemInformationProvider.getInstance().getItemEffect(itemEffect).applyTo(chr);
ItemInformationProvider.getInstance().getItemEffect(itemEffect).applyTo(chr);
}
}

6
src/main/java/server/quest/actions/ItemAction.java
View File

@@ -29,7 +29,7 @@ import client.inventory.manipulator.InventoryManipulator;
import constants.inventory.ItemConstants;
import provider.Data;
import provider.DataTool;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.quest.Quest;
import server.quest.QuestActionType;
import tools.FilePrinter;
@@ -241,7 +241,7 @@ public class ItemAction extends MapleQuestAction {
private void announceInventoryLimit(List<Integer> itemids, Character chr) {
for (Integer id : itemids) {
if (MapleItemInformationProvider.getInstance().isPickupRestricted(id) && chr.haveItemWithId(id, true)) {
if (ItemInformationProvider.getInstance().isPickupRestricted(id) && chr.haveItemWithId(id, true)) {
chr.dropMessage(1, "Please check if you already have a similar one-of-a-kind item in your inventory.");
return;
}
@@ -293,7 +293,7 @@ public class ItemAction extends MapleQuestAction {
}
public boolean restoreLostItem(Character chr, int itemid) {
if (!MapleItemInformationProvider.getInstance().isQuestItem(itemid)) {
if (!ItemInformationProvider.getInstance().isQuestItem(itemid)) {
return false;
}

4
src/main/java/server/quest/requirements/ItemRequirement.java
View File

@@ -27,7 +27,7 @@ import client.inventory.Item;
import constants.inventory.ItemConstants;
import provider.Data;
import provider.DataTool;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.quest.Quest;
import server.quest.QuestRequirementType;
@@ -60,7 +60,7 @@ public class ItemRequirement extends MapleQuestRequirement {
@Override
public boolean check(Character chr, Integer npcid) {
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
for(Integer itemId : items.keySet()) {
int countNeeded = items.get(itemId);
int count = 0;