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

21
src/main/java/server/movement/AbsoluteLifeMovement.java
View File

@@ -21,8 +21,9 @@
*/
package server.movement;
import java.awt.Point;
import tools.data.output.LittleEndianWriter;
import net.packet.OutPacket;
import java.awt.*;
public class AbsoluteLifeMovement extends AbstractLifeMovement {
private Point pixelsPerSecond;
@@ -49,14 +50,12 @@ public class AbsoluteLifeMovement extends AbstractLifeMovement {
}
@Override
public void serialize(LittleEndianWriter lew) {
lew.write(getType());
lew.writeShort(getPosition().x);
lew.writeShort(getPosition().y);
lew.writeShort(pixelsPerSecond.x);
lew.writeShort(pixelsPerSecond.y);
lew.writeShort(fh);
lew.write(getNewstate());
lew.writeShort(getDuration());
public void serialize(OutPacket p) {
p.writeByte(getType());
p.writePos(getPosition());
p.writePos(pixelsPerSecond);
p.writeShort(fh);
p.writeByte(getNewstate());
p.writeShort(getDuration());
}
}

18
src/main/java/server/movement/ChairMovement.java
View File

@@ -21,8 +21,9 @@
*/
package server.movement;
import java.awt.Point;
import tools.data.output.LittleEndianWriter;
import net.packet.OutPacket;
import java.awt.*;
public class ChairMovement extends AbstractLifeMovement {
private int fh;
@@ -40,13 +41,12 @@ public class ChairMovement extends AbstractLifeMovement {
}
@Override
public void serialize(LittleEndianWriter lew) {
lew.write(getType());
lew.writeShort(getPosition().x);
lew.writeShort(getPosition().y);
lew.writeShort(fh);
lew.write(getNewstate());
lew.writeShort(getDuration());
public void serialize(OutPacket p) {
p.writeByte(getType());
p.writePos(getPosition());
p.writeShort(fh);
p.writeByte(getNewstate());
p.writeShort(getDuration());
}
}

13
src/main/java/server/movement/ChangeEquip.java
View File

@@ -21,20 +21,21 @@
*/
package server.movement;
import java.awt.Point;
import tools.data.output.LittleEndianWriter;
import net.packet.OutPacket;
import java.awt.*;
public class ChangeEquip implements LifeMovementFragment {
private int wui;
private final int wui;
public ChangeEquip(int wui) {
this.wui = wui;
}
@Override
public void serialize(LittleEndianWriter lew) {
lew.write(10);
lew.write(wui);
public void serialize(OutPacket p) {
p.writeByte(10);
p.writeByte(wui);
}
@Override

23
src/main/java/server/movement/JumpDownMovement.java
View File

@@ -21,8 +21,9 @@
*/
package server.movement;
import java.awt.Point;
import tools.data.output.LittleEndianWriter;
import net.packet.OutPacket;
import java.awt.*;
public class JumpDownMovement extends AbstractLifeMovement {
private Point pixelsPerSecond;
@@ -58,15 +59,13 @@ public class JumpDownMovement extends AbstractLifeMovement {
}
@Override
public void serialize(LittleEndianWriter lew) {
lew.write(getType());
lew.writeShort(getPosition().x);
lew.writeShort(getPosition().y);
lew.writeShort(pixelsPerSecond.x);
lew.writeShort(pixelsPerSecond.y);
lew.writeShort(fh);
lew.writeShort(originFh);
lew.write(getNewstate());
lew.writeShort(getDuration());
public void serialize(OutPacket p) {
p.writeByte(getType());
p.writePos(getPosition());
p.writePos(pixelsPerSecond);
p.writeShort(fh);
p.writeShort(originFh);
p.writeByte(getNewstate());
p.writeShort(getDuration());
}
}

7
src/main/java/server/movement/LifeMovementFragment.java
View File

@@ -21,10 +21,11 @@
*/
package server.movement;
import java.awt.Point;
import tools.data.output.LittleEndianWriter;
import net.packet.OutPacket;
import java.awt.*;
public interface LifeMovementFragment {
void serialize(LittleEndianWriter lew);
void serialize(OutPacket p);
Point getPosition();
}

16
src/main/java/server/movement/RelativeLifeMovement.java
View File

@@ -21,8 +21,9 @@
*/
package server.movement;
import java.awt.Point;
import tools.data.output.LittleEndianWriter;
import net.packet.OutPacket;
import java.awt.*;
public class RelativeLifeMovement extends AbstractLifeMovement {
public RelativeLifeMovement(int type, Point position, int duration, int newstate) {
@@ -30,11 +31,10 @@ public class RelativeLifeMovement extends AbstractLifeMovement {
}
@Override
public void serialize(LittleEndianWriter lew) {
lew.write(getType());
lew.writeShort(getPosition().x);
lew.writeShort(getPosition().y);
lew.write(getNewstate());
lew.writeShort(getDuration());
public void serialize(OutPacket p) {
p.writeByte(getType());
p.writePos(getPosition());
p.writeByte(getNewstate());
p.writeShort(getDuration());
}
}

17
src/main/java/server/movement/TeleportMovement.java
View File

@@ -20,8 +20,9 @@
*/
package server.movement;
import java.awt.Point;
import tools.data.output.LittleEndianWriter;
import net.packet.OutPacket;
import java.awt.*;
public class TeleportMovement extends AbsoluteLifeMovement {
@@ -30,12 +31,10 @@ public class TeleportMovement extends AbsoluteLifeMovement {
}
@Override
public void serialize(LittleEndianWriter lew) {
lew.write(getType());
lew.writeShort(getPosition().x);
lew.writeShort(getPosition().y);
lew.writeShort(getPixelsPerSecond().x);
lew.writeShort(getPixelsPerSecond().y);
lew.write(getNewstate());
public void serialize(OutPacket p) {
p.writeByte(getType());
p.writePos(getPosition());
p.writePos(getPixelsPerSecond());
p.writeByte(getNewstate());
}
}