Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove "Maple" prefix from MaplePacketCreator name

Browse Source
This commit is contained in:
P0nk
2021-08-19 21:31:57 +02:00
parent 579e3c639f
commit e184f25184
307 changed files with 2285 additions and 2328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,7 @@ import server.maps.MapleMapObjectType;
import server.partyquest.PartyQuest;
import server.partyquest.Pyramid;
import server.quest.MapleQuest;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import java.awt.*;
@@ -526,9 +526,9 @@ public class AbstractPlayerInteraction {
getPlayer().addPet(evolved);
getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.showPet(c.getPlayer(), evolved, false, false), true);
c.announce(MaplePacketCreator.petStatUpdate(c.getPlayer()));
c.announce(MaplePacketCreator.enableActions());
getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.showPet(c.getPlayer(), evolved, false, false), true);
c.announce(PacketCreator.petStatUpdate(c.getPlayer()));
c.announce(PacketCreator.enableActions());
chr.getClient().getWorldServer().registerPetHunger(chr, chr.getPetIndex(evolved));
*/
@@ -635,7 +635,7 @@ public class AbstractPlayerInteraction {
MapleInventoryManipulator.removeById(c, ItemConstants.getInventoryType(id), id, -quantity, true, false);
}
if (showMessage) {
c.announce(MaplePacketCreator.getShowItemGain(id, quantity, true));
c.announce(PacketCreator.getShowItemGain(id, quantity, true));
}
return item;
@@ -646,11 +646,11 @@ public class AbstractPlayerInteraction {
}
public void changeMusic(String songName) {
getPlayer().getMap().broadcastMessage(MaplePacketCreator.musicChange(songName));
getPlayer().getMap().broadcastMessage(PacketCreator.musicChange(songName));
}
public void playerMessage(int type, String message) {
c.announce(MaplePacketCreator.serverNotice(type, message));
c.announce(PacketCreator.serverNotice(type, message));
}
public void message(String message) {
@@ -662,15 +662,15 @@ public class AbstractPlayerInteraction {
}
public void mapMessage(int type, String message) {
getPlayer().getMap().broadcastMessage(MaplePacketCreator.serverNotice(type, message));
getPlayer().getMap().broadcastMessage(PacketCreator.serverNotice(type, message));
}
public void mapEffect(String path) {
c.announce(MaplePacketCreator.mapEffect(path));
c.announce(PacketCreator.mapEffect(path));
}
public void mapSound(String path) {
c.announce(MaplePacketCreator.mapSound(path));
c.announce(PacketCreator.mapSound(path));
}
public void displayAranIntro() {
@@ -699,17 +699,17 @@ public class AbstractPlayerInteraction {
}
public void showIntro(String path) {
c.announce(MaplePacketCreator.showIntro(path));
c.announce(PacketCreator.showIntro(path));
}
public void showInfo(String path) {
c.announce(MaplePacketCreator.showInfo(path));
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.showInfo(path));
c.announce(PacketCreator.enableActions());
}
public void guildMessage(int type, String message) {
if (getGuild() != null) {
getGuild().guildMessage(MaplePacketCreator.serverNotice(type, message));
getGuild().guildMessage(PacketCreator.serverNotice(type, message));
}
}
@@ -754,7 +754,7 @@ public class AbstractPlayerInteraction {
} else {
MapleInventoryManipulator.removeById(cl, ItemConstants.getInventoryType(id), id, -quantity, true, false);
}
cl.announce(MaplePacketCreator.getShowItemGain(id, quantity, true));
cl.announce(PacketCreator.getShowItemGain(id, quantity, true));
}
}
@@ -847,7 +847,7 @@ public class AbstractPlayerInteraction {
int possesed = iv.countById(id);
if (possesed > 0) {
MapleInventoryManipulator.removeById(c, ItemConstants.getInventoryType(id), id, possesed, true, false);
chr.announce(MaplePacketCreator.getShowItemGain(id, (short) -possesed, true));
chr.announce(PacketCreator.getShowItemGain(id, (short) -possesed, true));
}
}
}
@@ -861,13 +861,13 @@ public class AbstractPlayerInteraction {
int possessed = cl.getPlayer().getInventory(invType).countById(id);
if (possessed > 0) {
MapleInventoryManipulator.removeById(cl, ItemConstants.getInventoryType(id), id, possessed, true, false);
cl.announce(MaplePacketCreator.getShowItemGain(id, (short) -possessed, true));
cl.announce(PacketCreator.getShowItemGain(id, (short) -possessed, true));
}
if(invType == MapleInventoryType.EQUIP) {
if(cl.getPlayer().getInventory(MapleInventoryType.EQUIPPED).countById(id) > 0) {
MapleInventoryManipulator.removeById(cl, MapleInventoryType.EQUIPPED, id, 1, true, false);
cl.announce(MaplePacketCreator.getShowItemGain(id, (short) -1, true));
cl.announce(PacketCreator.getShowItemGain(id, (short) -1, true));
}
}
}
@@ -881,12 +881,12 @@ public class AbstractPlayerInteraction {
}
public void showInstruction(String msg, int width, int height) {
c.announce(MaplePacketCreator.sendHint(msg, width, height));
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.sendHint(msg, width, height));
c.announce(PacketCreator.enableActions());
}
public void disableMinimap() {
c.announce(MaplePacketCreator.disableMinimap());
c.announce(PacketCreator.disableMinimap());
}
public boolean isAllReactorState(final int reactorId, final int state) {
@@ -898,13 +898,13 @@ public class AbstractPlayerInteraction {
getMap(mapid).killAllMonsters();
for (MapleMapObject i : getMap(mapid).getMapObjectsInRange(c.getPlayer().getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM))) {
getMap(mapid).removeMapObject(i);
getMap(mapid).broadcastMessage(MaplePacketCreator.removeItemFromMap(i.getObjectId(), 0, c.getPlayer().getId()));
getMap(mapid).broadcastMessage(PacketCreator.removeItemFromMap(i.getObjectId(), 0, c.getPlayer().getId()));
}
}
public void useItem(int id) {
MapleItemInformationProvider.getInstance().getItemEffect(id).applyTo(c.getPlayer());
c.announce(MaplePacketCreator.getItemMessage(id));//Useful shet :3
c.announce(PacketCreator.getItemMessage(id));//Useful shet :3
}
public void cancelItem(final int id) {
@@ -924,7 +924,7 @@ public class AbstractPlayerInteraction {
return;
}
} else if (GameConstants.isAranSkills(skillid)) {
c.announce(MaplePacketCreator.showInfo("Effect/BasicEff.img/AranGetSkill"));
c.announce(PacketCreator.showInfo("Effect/BasicEff.img/AranGetSkill"));
}
getPlayer().changeSkillLevel(skill, level, masterLevel, expiration);
@@ -943,7 +943,7 @@ public class AbstractPlayerInteraction {
final Item newItem = MapleItemInformationProvider.getInstance().getEquipById(itemid);
newItem.setPosition(slot);
c.getPlayer().getInventory(MapleInventoryType.EQUIPPED).addItemFromDB(newItem);
c.announce(MaplePacketCreator.modifyInventory(false, Collections.singletonList(new ModifyInventory(0, newItem))));
c.announce(PacketCreator.modifyInventory(false, Collections.singletonList(new ModifyInventory(0, newItem))));
}
public void spawnNpc(int npcId, Point pos, MapleMap map) {
@@ -955,7 +955,7 @@ public class AbstractPlayerInteraction {
npc.setRx1(pos.x - 50);
npc.setFh(map.getFootholds().findBelow(pos).getId());
map.addMapObject(npc);
map.broadcastMessage(MaplePacketCreator.spawnNPC(npc));
map.broadcastMessage(PacketCreator.spawnNPC(npc));
}
}
@@ -974,19 +974,19 @@ public class AbstractPlayerInteraction {
}
public void spawnGuide() {
c.announce(MaplePacketCreator.spawnGuide(true));
c.announce(PacketCreator.spawnGuide(true));
}
public void removeGuide() {
c.announce(MaplePacketCreator.spawnGuide(false));
c.announce(PacketCreator.spawnGuide(false));
}
public void displayGuide(int num) {
c.announce(MaplePacketCreator.showInfo("UI/tutorial.img/" + num));
c.announce(PacketCreator.showInfo("UI/tutorial.img/" + num));
}
public void goDojoUp() {
c.announce(MaplePacketCreator.dojoWarpUp());
c.announce(PacketCreator.dojoWarpUp());
}
public void resetDojoEnergy() {
@@ -1000,28 +1000,28 @@ public class AbstractPlayerInteraction {
}
public void enableActions() {
c.announce(MaplePacketCreator.enableActions());
c.announce(PacketCreator.enableActions());
}
public void showEffect(String effect){
c.announce(MaplePacketCreator.showEffect(effect));
c.announce(PacketCreator.showEffect(effect));
}
public void dojoEnergy() {
c.announce(MaplePacketCreator.getEnergy("energy", getPlayer().getDojoEnergy()));
c.announce(PacketCreator.getEnergy("energy", getPlayer().getDojoEnergy()));
}
public void talkGuide(String message) {
c.announce(MaplePacketCreator.talkGuide(message));
c.announce(PacketCreator.talkGuide(message));
}
public void guideHint(int hint) {
c.announce(MaplePacketCreator.guideHint(hint));
c.announce(PacketCreator.guideHint(hint));
}
public void updateAreaInfo(Short area, String info) {
c.getPlayer().updateAreaInfo(area, info);
c.announce(MaplePacketCreator.enableActions());//idk, nexon does the same :P
c.announce(PacketCreator.enableActions());//idk, nexon does the same :P
}
public boolean containsAreaInfo(short area, String info) {
@@ -1029,33 +1029,33 @@ public class AbstractPlayerInteraction {
}
public void earnTitle(String msg) {
c.announce(MaplePacketCreator.earnTitleMessage(msg));
c.announce(PacketCreator.earnTitleMessage(msg));
}
public void showInfoText(String msg) {
c.announce(MaplePacketCreator.showInfoText(msg));
c.announce(PacketCreator.showInfoText(msg));
}
public void openUI(byte ui) {
c.announce(MaplePacketCreator.openUI(ui));
c.announce(PacketCreator.openUI(ui));
}
public void lockUI() {
c.announce(MaplePacketCreator.disableUI(true));
c.announce(MaplePacketCreator.lockUI(true));
c.announce(PacketCreator.disableUI(true));
c.announce(PacketCreator.lockUI(true));
}
public void unlockUI() {
c.announce(MaplePacketCreator.disableUI(false));
c.announce(MaplePacketCreator.lockUI(false));
c.announce(PacketCreator.disableUI(false));
c.announce(PacketCreator.lockUI(false));
}
public void playSound(String sound) {
getPlayer().getMap().broadcastMessage(MaplePacketCreator.environmentChange(sound, 4));
getPlayer().getMap().broadcastMessage(PacketCreator.environmentChange(sound, 4));
}
public void environmentChange(String env, int mode) {
getPlayer().getMap().broadcastMessage(MaplePacketCreator.environmentChange(env, mode));
getPlayer().getMap().broadcastMessage(PacketCreator.environmentChange(env, mode));
}
public String numberWithCommas(int number) {
@@ -1183,7 +1183,7 @@ public class AbstractPlayerInteraction {
}
public void npcTalk(int npcid, String message) {
c.announce(MaplePacketCreator.getNPCTalk(npcid, (byte) 0, message, "00 00", (byte) 0));
c.announce(PacketCreator.getNPCTalk(npcid, (byte) 0, message, "00 00", (byte) 0));
}
public long getCurrentTime() {