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

22
src/main/java/client/inventory/Equip.java
View File

@@ -25,7 +25,7 @@ import client.Client;
import config.YamlConfig;
import constants.game.ExpTable;
import constants.inventory.ItemConstants;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import tools.PacketCreator;
import tools.Pair;
import tools.Randomizer;
@@ -83,7 +83,7 @@ public class Equip extends Item {
this.itemExp = 0;
this.itemLevel = 1;
this.isElemental = (MapleItemInformationProvider.getInstance().getEquipLevel(id, false) > 1);
this.isElemental = (ItemInformationProvider.getInstance().getEquipLevel(id, false) > 1);
}
@Override
@@ -306,7 +306,7 @@ public class Equip extends Item {
}
private static boolean isPhysicalWeapon(int itemid) {
Equip eqp = (Equip) MapleItemInformationProvider.getInstance().getEquipById(itemid);
Equip eqp = (Equip) ItemInformationProvider.getInstance().getEquipById(itemid);
return eqp.getWatk() >= eqp.getMatk();
}
@@ -476,7 +476,7 @@ public class Equip extends Item {
List<Pair<StatUpgrade, Integer>> stats = new LinkedList<>();
if(isElemental) {
List<Pair<String, Integer>> elementalStats = MapleItemInformationProvider.getInstance().getItemLevelupStats(getItemId(), itemLevel);
List<Pair<String, Integer>> elementalStats = ItemInformationProvider.getInstance().getItemLevelupStats(getItemId(), itemLevel);
for(Pair<String, Integer> p: elementalStats) {
if(p.getRight() > 0) stats.add(new Pair<>(StatUpgrade.valueOf(p.getLeft()), p.getRight()));
@@ -510,8 +510,8 @@ public class Equip extends Item {
itemLevel++;
String lvupStr = "'" + MapleItemInformationProvider.getInstance().getName(this.getItemId()) + "' is now level " + itemLevel + "! ";
String showStr = "#e'" + MapleItemInformationProvider.getInstance().getName(this.getItemId()) + "'#b is now #elevel #r" + itemLevel + "#k#b!";
String lvupStr = "'" + ItemInformationProvider.getInstance().getName(this.getItemId()) + "' is now level " + itemLevel + "! ";
String showStr = "#e'" + ItemInformationProvider.getInstance().getName(this.getItemId()) + "'#b is now #elevel #r" + itemLevel + "#k#b!";
Pair<String, Pair<Boolean, Boolean>> res = this.gainStats(stats);
lvupStr += res.getLeft();
@@ -519,11 +519,11 @@ public class Equip extends Item {
boolean gotVicious = res.getRight().getRight();
if (gotVicious) {
//c.getPlayer().dropMessage(6, "A new Vicious Hammer opportunity has been found on the '" + MapleItemInformationProvider.getInstance().getName(getItemId()) + "'!");
//c.getPlayer().dropMessage(6, "A new Vicious Hammer opportunity has been found on the '" + ItemInformationProvider.getInstance().getName(getItemId()) + "'!");
lvupStr += "+VICIOUS ";
}
if (gotSlot) {
//c.getPlayer().dropMessage(6, "A new upgrade slot has been found on the '" + MapleItemInformationProvider.getInstance().getName(getItemId()) + "'!");
//c.getPlayer().dropMessage(6, "A new upgrade slot has been found on the '" + ItemInformationProvider.getInstance().getName(getItemId()) + "'!");
lvupStr += "+UPGSLOT ";
}
@@ -559,7 +559,7 @@ public class Equip extends Item {
}
public synchronized void gainItemExp(Client c, int gain) { // Ronan's Equip Exp gain method
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
if(!ii.isUpgradeable(this.getItemId())) {
return;
}
@@ -601,7 +601,7 @@ public class Equip extends Item {
private boolean reachedMaxLevel() {
if (isElemental) {
if (itemLevel < MapleItemInformationProvider.getInstance().getEquipLevel(getItemId(), true)) {
if (itemLevel < ItemInformationProvider.getInstance().getEquipLevel(getItemId(), true)) {
return false;
}
}
@@ -610,7 +610,7 @@ public class Equip extends Item {
}
public String showEquipFeatures(Client c) {
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
if(!ii.isUpgradeable(this.getItemId())) return "";
String eqpName = ii.getName(getItemId());