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

All packet creating methods now create Packet instead of byte[]

Browse Source 
This commit got way too big...
- Remove deprecated methods for sending packets
- Favor OutPacket & Packet over MaplePacketLittleEndianWriter, LittleEndianWriter, and byte array
- Split up some packet creating methods into separate classes
This commit is contained in:
P0nk
2021-08-21 01:36:51 +02:00
parent b5cd6887ae
commit 8f6860d7d7
231 changed files with 6403 additions and 6927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
src/main/java/net/server/channel/handlers/MTSHandler.java
View File

@@ -29,6 +29,7 @@ import client.inventory.MapleInventoryType;
import client.inventory.manipulator.MapleInventoryManipulator;
import constants.inventory.ItemConstants;
import net.AbstractMaplePacketHandler;
import net.packet.Packet;
import net.server.Server;
import net.server.channel.Channel;
import server.MTSItemInfo;
@@ -114,9 +115,9 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
if (rs.next()) {
if (rs.getInt(1) > 10) { //They have more than 10 items up for sale already!
c.getPlayer().dropMessage(1, "You already have 10 items up for auction!");
c.announce(getMTS(1, 0, 0));
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.sendPacket(getMTS(1, 0, 0));
c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
rs.close();
ps.close();
return;
@@ -219,11 +220,11 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
e.printStackTrace();
}
c.getPlayer().gainMeso(-5000, false);
c.announce(PacketCreator.MTSConfirmSell());
c.announce(getMTS(1, 0, 0));
c.sendPacket(PacketCreator.MTSConfirmSell());
c.sendPacket(getMTS(1, 0, 0));
c.enableCSActions();
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
}
} else if (op == 3) { //send offer for wanted item
} else if (op == 4) { //list wanted item
@@ -238,18 +239,18 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
int page = slea.readInt();
c.getPlayer().changePage(page);
if (tab == 4 && type == 0) {
c.announce(getCart(c.getPlayer().getId()));
c.sendPacket(getCart(c.getPlayer().getId()));
} else if (tab == c.getPlayer().getCurrentTab() && type == c.getPlayer().getCurrentType() && c.getPlayer().getSearch() != null) {
c.announce(getMTSSearch(tab, type, c.getPlayer().getCurrentCI(), c.getPlayer().getSearch(), page));
c.sendPacket(getMTSSearch(tab, type, c.getPlayer().getCurrentCI(), c.getPlayer().getSearch(), page));
} else {
c.getPlayer().setSearch(null);
c.announce(getMTS(tab, type, page));
c.sendPacket(getMTS(tab, type, page));
}
c.getPlayer().changeTab(tab);
c.getPlayer().changeType(type);
c.enableCSActions();
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
} else if (op == 6) { //search
int tab = slea.readInt();
int type = slea.readInt();
@@ -261,11 +262,11 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
c.getPlayer().changeType(type);
c.getPlayer().changeCI(ci);
c.enableCSActions();
c.announce(PacketCreator.enableActions());
c.announce(getMTSSearch(tab, type, ci, search, c.getPlayer().getCurrentPage()));
c.announce(PacketCreator.showMTSCash(c.getPlayer()));
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.sendPacket(PacketCreator.enableActions());
c.sendPacket(getMTSSearch(tab, type, ci, search, c.getPlayer().getCurrentPage()));
c.sendPacket(PacketCreator.showMTSCash(c.getPlayer()));
c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
} else if (op == 7) { //cancel sale
int id = slea.readInt(); //id of the item
Connection con = null;
@@ -285,9 +286,9 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
e.printStackTrace();
}
c.enableCSActions();
c.announce(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(), c.getPlayer().getCurrentPage()));
c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.sendPacket(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(), c.getPlayer().getCurrentPage()));
c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
} else if (op == 8) { //transfer item from transfer inv.
int id = slea.readInt(); //id of the item
Connection con = null;
@@ -344,10 +345,10 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
}
MapleInventoryManipulator.addFromDrop(c, i, false);
c.enableCSActions();
c.announce(getCart(c.getPlayer().getId()));
c.announce(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(), c.getPlayer().getCurrentPage()));
c.announce(PacketCreator.MTSConfirmTransfer(i.getQuantity(), i.getPosition()));
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.sendPacket(getCart(c.getPlayer().getId()));
c.sendPacket(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(), c.getPlayer().getCurrentPage()));
c.sendPacket(PacketCreator.MTSConfirmTransfer(i.getQuantity(), i.getPosition()));
c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
}
rs.close();
ps.close();
@@ -385,11 +386,11 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
} catch (SQLException e) {
e.printStackTrace();
}
c.announce(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(), c.getPlayer().getCurrentPage()));
c.sendPacket(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(), c.getPlayer().getCurrentPage()));
c.enableCSActions();
c.announce(PacketCreator.enableActions());
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.sendPacket(PacketCreator.enableActions());
c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
} else if (op == 10) { //delete from cart
int id = slea.readInt(); //id of the item
Connection con = null;
@@ -404,10 +405,10 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
} catch (SQLException e) {
e.printStackTrace();
}
c.announce(getCart(c.getPlayer().getId()));
c.sendPacket(getCart(c.getPlayer().getId()));
c.enableCSActions();
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
} else if (op == 12) { //put item up for auction
} else if (op == 13) { //cancel wanted cart thing
} else if (op == 14) { //buy auction item now
@@ -458,14 +459,14 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
pse.close();
c.getPlayer().getCashShop().gainCash(4, -price);
c.enableCSActions();
c.announce(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(), c.getPlayer().getCurrentPage()));
c.announce(PacketCreator.MTSConfirmBuy());
c.announce(PacketCreator.showMTSCash(c.getPlayer()));
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.announce(PacketCreator.enableActions());
c.sendPacket(getMTS(c.getPlayer().getCurrentTab(), c.getPlayer().getCurrentType(), c.getPlayer().getCurrentPage()));
c.sendPacket(PacketCreator.MTSConfirmBuy());
c.sendPacket(PacketCreator.showMTSCash(c.getPlayer()));
c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.sendPacket(PacketCreator.enableActions());
} else {
c.announce(PacketCreator.MTSFailBuy());
c.sendPacket(PacketCreator.MTSFailBuy());
}
}
rs.close();
@@ -473,7 +474,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
con.close();
} catch (SQLException e) {
e.printStackTrace();
c.announce(PacketCreator.MTSFailBuy());
c.sendPacket(PacketCreator.MTSFailBuy());
}
} else if (op == 17) { //buy from cart
int id = slea.readInt(); //id of the item
@@ -518,14 +519,14 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
pse.executeUpdate();
pse.close();
c.getPlayer().getCashShop().gainCash(4, -price);
c.announce(getCart(c.getPlayer().getId()));
c.sendPacket(getCart(c.getPlayer().getId()));
c.enableCSActions();
c.announce(PacketCreator.MTSConfirmBuy());
c.announce(PacketCreator.showMTSCash(c.getPlayer()));
c.announce(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.announce(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
c.sendPacket(PacketCreator.MTSConfirmBuy());
c.sendPacket(PacketCreator.showMTSCash(c.getPlayer()));
c.sendPacket(PacketCreator.transferInventory(getTransfer(c.getPlayer().getId())));
c.sendPacket(PacketCreator.notYetSoldInv(getNotYetSold(c.getPlayer().getId())));
} else {
c.announce(PacketCreator.MTSFailBuy());
c.sendPacket(PacketCreator.MTSFailBuy());
}
}
rs.close();
@@ -533,13 +534,13 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
con.close();
} catch (SQLException e) {
e.printStackTrace();
c.announce(PacketCreator.MTSFailBuy());
c.sendPacket(PacketCreator.MTSFailBuy());
}
} else {
System.out.println("Unhandled OP(MTS): " + op + " Packet: " + slea.toString());
}
} else {
c.announce(PacketCreator.showMTSCash(c.getPlayer()));
c.sendPacket(PacketCreator.showMTSCash(c.getPlayer()));
}
}
@@ -598,7 +599,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
return items;
}
public byte[] getCart(int cid) {
public Packet getCart(int cid) {
List<MTSItemInfo> items = new ArrayList<>();
Connection con = null;
PreparedStatement ps;
@@ -726,7 +727,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
return items;
}
private static byte[] getMTS(int tab, int type, int page) {
private static Packet getMTS(int tab, int type, int page) {
List<MTSItemInfo> items = new ArrayList<>();
Connection con = null;
PreparedStatement ps;
@@ -806,7 +807,7 @@ public final class MTSHandler extends AbstractMaplePacketHandler {
return PacketCreator.sendMTS(items, tab, type, page, pages); // resniff
}
public byte[] getMTSSearch(int tab, int type, int cOi, String search, int page) {
public Packet getMTSSearch(int tab, int type, int cOi, String search, int page) {
List<MTSItemInfo> items = new ArrayList<>();
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
String listaitems = "";