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

8
src/main/java/tools/LogHelper.java
View File

@@ -4,7 +4,7 @@ import client.Character;
import client.Client;
import client.inventory.Item;
import net.server.Server;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.MapleTrade;
import server.expeditions.Expedition;
@@ -21,13 +21,13 @@ public class LogHelper {
//Trade 1 to trade 2
log += trade1.getExchangeMesos() + " mesos from " + name1 + " to " + name2 + " \r\n";
for (Item item : trade1.getItems()){
String itemName = MapleItemInformationProvider.getInstance().getName(item.getItemId()) + "(" + item.getItemId() + ")";
String itemName = ItemInformationProvider.getInstance().getName(item.getItemId()) + "(" + item.getItemId() + ")";
log += item.getQuantity() + " " + itemName + " from " + name1 + " to " + name2 + " \r\n";
}
//Trade 2 to trade 1
log += trade2.getExchangeMesos() + " mesos from " + name2 + " to " + name1 + " \r\n";
for (Item item : trade2.getItems()){
String itemName = MapleItemInformationProvider.getInstance().getName(item.getItemId()) + "(" + item.getItemId() + ")";
String itemName = ItemInformationProvider.getInstance().getName(item.getItemId()) + "(" + item.getItemId() + ")";
log += item.getQuantity() + " " + itemName + " from " + name2 + " to " + name1 + " \r\n";
}
log += "\r\n\r\n";
@@ -65,7 +65,7 @@ public class LogHelper {
}
public static void logGacha(Character player, int itemid, String map) {
String itemName = MapleItemInformationProvider.getInstance().getName(itemid);
String itemName = ItemInformationProvider.getInstance().getName(itemid);
String timeStamp = new SimpleDateFormat("dd-MM-yyyy hh:mm:ss").format(new Date());
String log = player.getName() + " got a " + itemName + "(" + itemid + ") from the " + map + " gachapon. - " + timeStamp;
FilePrinter.print(FilePrinter.LOG_GACHAPON, log);

10
src/main/java/tools/PacketCreator.java
View File

@@ -248,7 +248,7 @@ public class PacketCreator {
private static void addCharEquips(final OutPacket p, Character chr) {
Inventory equip = chr.getInventory(InventoryType.EQUIPPED);
Collection<Item> ii = MapleItemInformationProvider.getInstance().canWearEquipment(chr, equip.list());
Collection<Item> ii = ItemInformationProvider.getInstance().canWearEquipment(chr, equip.list());
Map<Short, Integer> myEquip = new LinkedHashMap<>();
Map<Short, Integer> maskedEquip = new LinkedHashMap<>();
for (Item item : ii) {
@@ -347,7 +347,7 @@ public class PacketCreator {
}
protected static void addItemInfo(final OutPacket p, Item item, boolean zeroPosition) {
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
boolean isCash = ii.isCash(item.getItemId());
boolean isPet = item.getPetId() > -1;
boolean isRing = false;
@@ -2358,7 +2358,7 @@ public class PacketCreator {
}
public static Packet getNPCShop(Client c, int sid, List<MapleShopItem> items) {
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
final OutPacket p = OutPacket.create(SendOpcode.OPEN_NPC_SHOP);
p.writeInt(sid);
p.writeShort(items.size()); // item count
@@ -2711,7 +2711,7 @@ public class PacketCreator {
p.writeByte(0); //end of pets
Item mount; //mounts can potentially crash the client if the player's level is not properly checked
if (chr.getMount() != null && (mount = chr.getInventory(InventoryType.EQUIPPED).getItem((short) -18)) != null && MapleItemInformationProvider.getInstance().getEquipLevelReq(mount.getItemId()) <= chr.getLevel()) {
if (chr.getMount() != null && (mount = chr.getInventory(InventoryType.EQUIPPED).getItem((short) -18)) != null && ItemInformationProvider.getInstance().getEquipLevelReq(mount.getItemId()) <= chr.getLevel()) {
Mount mmount = chr.getMount();
p.writeByte(mmount.getId()); //mount
p.writeInt(mmount.getLevel()); //level
@@ -2730,7 +2730,7 @@ public class PacketCreator {
p.writeInt(book.getNormalCard());
p.writeInt(book.getSpecialCard());
p.writeInt(book.getTotalCards());
p.writeInt(chr.getMonsterBookCover() > 0 ? MapleItemInformationProvider.getInstance().getCardMobId(chr.getMonsterBookCover()) : 0);
p.writeInt(chr.getMonsterBookCover() > 0 ? ItemInformationProvider.getInstance().getCardMobId(chr.getMonsterBookCover()) : 0);
Item medal = chr.getInventory(InventoryType.EQUIPPED).getItem((short) -49);
if (medal != null) {
p.writeInt(medal.getItemId());

6
src/main/java/tools/mapletools/CashCosmeticsFetcher.java
View File

@@ -1,6 +1,6 @@
package tools.mapletools;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import tools.DatabaseConnection;
import java.io.BufferedReader;
@@ -85,7 +85,7 @@ public class CashCosmeticsFetcher {
}
private static void reportCosmeticCouponResults() {
final MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
final ItemInformationProvider ii = ItemInformationProvider.getInstance();
for (int itemid = 5150000; itemid <= 5154000; itemid++) {
String itemName = ii.getName(itemid);
@@ -102,7 +102,7 @@ public class CashCosmeticsFetcher {
}
public static void main(String[] args) {
DatabaseConnection.initializeConnectionPool(); // MapleItemInformationProvider loads unrelated stuff from the db
DatabaseConnection.initializeConnectionPool(); // ItemInformationProvider loads unrelated stuff from the db
try {
loadScripts();
System.out.println("Loaded scripts");

8
src/main/java/tools/mapletools/QuestItemFetcher.java
View File

@@ -2,7 +2,7 @@ package tools.mapletools;
import org.apache.commons.io.FileUtils;
import provider.wz.WZFiles;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import tools.DatabaseConnection;
import tools.Pair;
@@ -38,7 +38,7 @@ public class QuestItemFetcher {
private static final Map<Integer, int[]> mixedQuestidItems = new HashMap<>();
private static final Set<Integer> limitedQuestids = new HashSet<>();
private static MapleItemInformationProvider ii;
private static ItemInformationProvider ii;
private static PrintWriter printWriter = null;
private static BufferedReader bufferedReader = null;
private static byte status = 0;
@@ -520,8 +520,8 @@ public class QuestItemFetcher {
}
public static void main(String[] args) {
DatabaseConnection.initializeConnectionPool(); // MapleItemInformationProvider loads some unrelated db data
ii = MapleItemInformationProvider.getInstance();
DatabaseConnection.initializeConnectionPool(); // ItemInformationProvider loads some unrelated db data
ii = ItemInformationProvider.getInstance();
reportQuestItemData();
}

6
src/main/java/tools/mapletools/SkillMakerFetcher.java
View File

@@ -1,7 +1,7 @@
package tools.mapletools;
import provider.wz.WZFiles;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import tools.DatabaseConnection;
import java.io.*;
@@ -227,7 +227,7 @@ public class SkillMakerFetcher {
}
private static void generateUpdatedItemFee() {
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
float adjPrice = reqMeso;
if (itemid < 2000000) {
@@ -329,7 +329,7 @@ public class SkillMakerFetcher {
}
public static void main(String[] args) {
DatabaseConnection.initializeConnectionPool(); // Using MapleItemInformationProvider which loads som unrelated things from the db
DatabaseConnection.initializeConnectionPool(); // Using ItemInformationProvider which loads som unrelated things from the db
writeMakerTableData();
}
}

6
src/main/java/tools/packets/Fishing.java
View File

@@ -23,7 +23,7 @@ import client.Character;
import config.YamlConfig;
import constants.game.GameConstants;
import constants.inventory.ItemConstants;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import tools.PacketCreator;
import java.util.Calendar;
@@ -105,12 +105,12 @@ public class Fishing {
break;
case 2:
int itemid = getRandomItem();
rewardStr = "a(n) " + MapleItemInformationProvider.getInstance().getName(itemid) + ".";
rewardStr = "a(n) " + ItemInformationProvider.getInstance().getName(itemid) + ".";
if (chr.canHold(itemid)) {
chr.getAbstractPlayerInteraction().gainItem(itemid, true);
} else {
chr.showHint("Couldn't catch a(n) #r" + MapleItemInformationProvider.getInstance().getName(itemid) + "#k due to #e#b" + ItemConstants.getInventoryType(itemid) + "#k#n inventory limit.");
chr.showHint("Couldn't catch a(n) #r" + ItemInformationProvider.getInstance().getName(itemid) + "#k due to #e#b" + ItemConstants.getInventoryType(itemid) + "#k#n inventory limit.");
rewardStr += ".. but has goofed up due to full inventory.";
}
break;