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

Rename and clean up MapleClient

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:13:48 +02:00
parent da8837710a
commit b07e6799dc
425 changed files with 1110 additions and 1109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/server/handlers/CustomPacketHandler.java
View File

@@ -21,21 +21,21 @@
*/
package net.server.handlers;
import client.MapleClient;
import client.Client;
import net.PacketHandler;
import net.packet.InPacket;
import tools.PacketCreator;
public class CustomPacketHandler implements PacketHandler {
@Override
public void handlePacket(InPacket p, MapleClient c) {
public void handlePacket(InPacket p, Client c) {
if (p.available() > 0 && c.getGMLevel() == 4) {//w/e
c.sendPacket(PacketCreator.customPacket(p.readBytes((int) p.available())));
}
}
@Override
public boolean validateState(MapleClient c) {
public boolean validateState(Client c) {
return true;
}
}

6
src/main/java/net/server/handlers/KeepAliveHandler.java
View File

@@ -21,18 +21,18 @@
*/
package net.server.handlers;
import client.MapleClient;
import client.Client;
import net.PacketHandler;
import net.packet.InPacket;
public class KeepAliveHandler implements PacketHandler {
@Override
public void handlePacket(InPacket p, MapleClient c) {
public void handlePacket(InPacket p, Client c) {
c.pongReceived();
}
@Override
public boolean validateState(MapleClient c) {
public boolean validateState(Client c) {
return true;
}
}

6
src/main/java/net/server/handlers/LoginRequiringNoOpHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.handlers;
import client.MapleClient;
import client.Client;
import net.PacketHandler;
import net.packet.InPacket;
@@ -32,10 +32,10 @@ public final class LoginRequiringNoOpHandler implements PacketHandler {
return instance;
}
public void handlePacket(InPacket p, MapleClient c) {
public void handlePacket(InPacket p, Client c) {
}
public boolean validateState(MapleClient c) {
public boolean validateState(Client c) {
return c.isLoggedIn();
}
}

6
src/main/java/net/server/handlers/login/AcceptToSHandler.java
View File

@@ -1,6 +1,6 @@
package net.server.handlers.login;
import client.MapleClient;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import tools.PacketCreator;
@@ -12,12 +12,12 @@ import tools.PacketCreator;
public final class AcceptToSHandler extends AbstractPacketHandler {
@Override
public boolean validateState(MapleClient c) {
public boolean validateState(Client c) {
return !c.isLoggedIn();
}
@Override
public final void handlePacket(InPacket p, MapleClient c) {
public final void handlePacket(InPacket p, Client c) {
if (p.available() == 0 || p.readByte() != 1 || c.acceptToS()) {
c.disconnect(false, false);//Client dc's but just because I am cool I do this (:
return;

6
src/main/java/net/server/handlers/login/AfterLoginHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.handlers.login;
import client.MapleClient;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.coordinator.session.SessionCoordinator;
@@ -30,7 +30,7 @@ import tools.PacketCreator;
public final class AfterLoginHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
public final void handlePacket(InPacket p, Client c) {
byte c2 = p.readByte();
byte c3 = 5;
if (p.available() > 0) {
@@ -58,7 +58,7 @@ public final class AfterLoginHandler extends AbstractPacketHandler {
}
} else if (c2 == 0 && c3 == 5) {
SessionCoordinator.getInstance().closeSession(c, null);
c.updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN);
c.updateLoginState(Client.LOGIN_NOTLOGGEDIN);
}
}
}

4
src/main/java/net/server/handlers/login/CharSelectedHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.handlers.login;
import client.MapleClient;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
@@ -50,7 +50,7 @@ public final class CharSelectedHandler extends AbstractPacketHandler {
}
@Override
public final void handlePacket(InPacket p, MapleClient c) {
public final void handlePacket(InPacket p, Client c) {
int charId = p.readInt();
String macs = p.readString();

4
src/main/java/net/server/handlers/login/CharSelectedWithPicHandler.java
View File

@@ -1,6 +1,6 @@
package net.server.handlers.login;
import client.MapleClient;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
@@ -29,7 +29,7 @@ public class CharSelectedWithPicHandler extends AbstractPacketHandler {
}
@Override
public void handlePacket(InPacket p, MapleClient c) {
public void handlePacket(InPacket p, Client c) {
String pic = p.readString();
int charId = p.readInt();

4
src/main/java/net/server/handlers/login/CharlistRequestHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.handlers.login;
import client.MapleClient;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
@@ -32,7 +32,7 @@ import tools.PacketCreator;
public final class CharlistRequestHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
public final void handlePacket(InPacket p, Client c) {
p.readByte();
int world = p.readByte();

4
src/main/java/net/server/handlers/login/CheckCharNameHandler.java
View File

@@ -22,7 +22,7 @@
package net.server.handlers.login;
import client.Character;
import client.MapleClient;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import tools.PacketCreator;
@@ -30,7 +30,7 @@ import tools.PacketCreator;
public final class CheckCharNameHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
public final void handlePacket(InPacket p, Client c) {
String name = p.readString();
c.sendPacket(PacketCreator.charNameResponse(name, !Character.canCreateChar(name)));
}

4
src/main/java/net/server/handlers/login/CreateCharHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.handlers.login;
import client.MapleClient;
import client.Client;
import client.creator.novice.BeginnerCreator;
import client.creator.novice.LegendCreator;
import client.creator.novice.NoblesseCreator;
@@ -52,7 +52,7 @@ public final class CreateCharHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
public final void handlePacket(InPacket p, Client c) {
String name = p.readString();
int job = p.readInt();
int face = p.readInt();

4
src/main/java/net/server/handlers/login/DeleteCharHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.handlers.login;
import client.MapleClient;
import client.Client;
import client.MapleFamily;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -38,7 +38,7 @@ import java.sql.SQLException;
public final class DeleteCharHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
public final void handlePacket(InPacket p, Client c) {
String pic = p.readString();
int cid = p.readInt();
if (c.checkPic(pic)) {

4
src/main/java/net/server/handlers/login/GuestLoginHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.handlers.login;
import client.MapleClient;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import tools.PacketCreator;
@@ -32,7 +32,7 @@ import tools.PacketCreator;
public final class GuestLoginHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
public final void handlePacket(InPacket p, Client c) {
c.sendPacket(PacketCreator.sendGuestTOS());
//System.out.println(slea.toString());
new LoginPasswordHandler().handlePacket(p, c);

8
src/main/java/net/server/handlers/login/LoginPasswordHandler.java
View File

@@ -21,8 +21,8 @@
*/
package net.server.handlers.login;
import client.Client;
import client.DefaultDates;
import client.MapleClient;
import config.YamlConfig;
import net.PacketHandler;
import net.packet.InPacket;
@@ -43,7 +43,7 @@ import java.util.Calendar;
public final class LoginPasswordHandler implements PacketHandler {
@Override
public boolean validateState(MapleClient c) {
public boolean validateState(Client c) {
return !c.isLoggedIn();
}
@@ -54,7 +54,7 @@ public final class LoginPasswordHandler implements PacketHandler {
}
@Override
public final void handlePacket(InPacket p, MapleClient c) {
public final void handlePacket(InPacket p, Client c) {
String remoteHost = c.getRemoteAddress();
if (remoteHost.contentEquals("null")) {
c.sendPacket(PacketCreator.getLoginFailed(14)); // thanks Alchemist for noting remoteHost could be null
@@ -131,7 +131,7 @@ public final class LoginPasswordHandler implements PacketHandler {
}
}
private static void login(MapleClient c) {
private static void login(Client c) {
c.sendPacket(PacketCreator.getAuthSuccess(c));//why the fk did I do c.getAccountName()?
Server.getInstance().registerLoginState(c);
}

4
src/main/java/net/server/handlers/login/RegisterPicHandler.java
View File

@@ -1,6 +1,6 @@
package net.server.handlers.login;
import client.MapleClient;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
@@ -29,7 +29,7 @@ public final class RegisterPicHandler extends AbstractPacketHandler {
}
@Override
public final void handlePacket(InPacket p, MapleClient c) {
public final void handlePacket(InPacket p, Client c) {
p.readByte();
int charId = p.readInt();

8
src/main/java/net/server/handlers/login/RegisterPinHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.handlers.login;
import client.MapleClient;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.coordinator.session.SessionCoordinator;
@@ -32,11 +32,11 @@ import tools.PacketCreator;
*/
public final class RegisterPinHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
public final void handlePacket(InPacket p, Client c) {
byte c2 = p.readByte();
if (c2 == 0) {
SessionCoordinator.getInstance().closeSession(c, null);
c.updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN);
c.updateLoginState(Client.LOGIN_NOTLOGGEDIN);
} else {
String pin = p.readString();
if (pin != null) {
@@ -44,7 +44,7 @@ public final class RegisterPinHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.pinRegistered());
SessionCoordinator.getInstance().closeSession(c, null);
c.updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN);
c.updateLoginState(Client.LOGIN_NOTLOGGEDIN);
}
}
}

6
src/main/java/net/server/handlers/login/RelogRequestHandler.java
View File

@@ -21,19 +21,19 @@
*/
package net.server.handlers.login;
import client.MapleClient;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import tools.PacketCreator;
public final class RelogRequestHandler extends AbstractPacketHandler {
@Override
public boolean validateState(MapleClient c) {
public boolean validateState(Client c) {
return !c.isLoggedIn();
}
@Override
public final void handlePacket(InPacket p, MapleClient c) {
public final void handlePacket(InPacket p, Client c) {
c.sendPacket(PacketCreator.getRelogResponse());
}
}

4
src/main/java/net/server/handlers/login/ServerStatusRequestHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.handlers.login;
import client.MapleClient;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
@@ -31,7 +31,7 @@ import tools.PacketCreator;
public final class ServerStatusRequestHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
public final void handlePacket(InPacket p, Client c) {
byte world = (byte) p.readShort();
World wserv = Server.getInstance().getWorld(world);
if(wserv != null) {

4
src/main/java/net/server/handlers/login/ServerlistRequestHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.handlers.login;
import client.MapleClient;
import client.Client;
import constants.game.GameConstants;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -34,7 +34,7 @@ import java.util.List;
public final class ServerlistRequestHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
public final void handlePacket(InPacket p, Client c) {
Server server = Server.getInstance();
List<World> worlds = server.getWorlds();
c.requestedServerlist(worlds.size());

6
src/main/java/net/server/handlers/login/SetGenderHandler.java
View File

@@ -22,7 +22,7 @@
package net.server.handlers.login;
import client.MapleClient;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
@@ -35,7 +35,7 @@ import tools.PacketCreator;
*/
public class SetGenderHandler extends AbstractPacketHandler {
@Override
public void handlePacket(InPacket p, MapleClient c) {
public void handlePacket(InPacket p, Client c) {
if (c.getGender() == 10) { //Packet shouldn't come if Gender isn't 10.
byte confirmed = p.readByte();
if (confirmed == 0x01) {
@@ -45,7 +45,7 @@ public class SetGenderHandler extends AbstractPacketHandler {
Server.getInstance().registerLoginState(c);
} else {
SessionCoordinator.getInstance().closeSession(c, null);
c.updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN);
c.updateLoginState(Client.LOGIN_NOTLOGGEDIN);
}
}
}

4
src/main/java/net/server/handlers/login/ViewAllCharHandler.java
View File

@@ -22,7 +22,7 @@
package net.server.handlers.login;
import client.Character;
import client.MapleClient;
import client.Client;
import config.YamlConfig;
import net.AbstractPacketHandler;
import net.packet.InPacket;
@@ -34,7 +34,7 @@ import java.util.List;
public final class ViewAllCharHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, MapleClient c) {
public final void handlePacket(InPacket p, Client c) {
try {
if(!c.canRequestCharlist()) { // client breaks if the charlist request pops too soon
c.sendPacket(PacketCreator.showAllCharacter(0, 0));

4
src/main/java/net/server/handlers/login/ViewAllCharRegisterPicHandler.java
View File

@@ -1,6 +1,6 @@
package net.server.handlers.login;
import client.MapleClient;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
@@ -30,7 +30,7 @@ public final class ViewAllCharRegisterPicHandler extends AbstractPacketHandler {
}
@Override
public final void handlePacket(InPacket p, MapleClient c) {
public final void handlePacket(InPacket p, Client c) {
p.readByte();
int charId = p.readInt();
p.readInt(); // please don't let the client choose which world they should login

4
src/main/java/net/server/handlers/login/ViewAllCharSelectedHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.handlers.login;
import client.MapleClient;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
@@ -51,7 +51,7 @@ public final class ViewAllCharSelectedHandler extends AbstractPacketHandler {
}
@Override
public final void handlePacket(InPacket p, MapleClient c) {
public final void handlePacket(InPacket p, Client c) {
int charId = p.readInt();
p.readInt(); // please don't let the client choose which world they should login

4
src/main/java/net/server/handlers/login/ViewAllCharSelectedWithPicHandler.java
View File

@@ -1,6 +1,6 @@
package net.server.handlers.login;
import client.MapleClient;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
@@ -30,7 +30,7 @@ public class ViewAllCharSelectedWithPicHandler extends AbstractPacketHandler {
}
@Override
public void handlePacket(InPacket p, MapleClient c) {
public void handlePacket(InPacket p, Client c) {
String pic = p.readString();
int charId = p.readInt();