Parker2991/MCProtocolLib
1
0
Fork 0
mirror of https://github.com/GeyserMC/MCProtocolLib.git synced 2024-12-04 21:01:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update world border packet field names.

Browse source
This commit is contained in:
Steveice10 2020-05-21 14:15:47 -07:00
parent 0d283166e5
commit e61bc83823
1 changed files with 50 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
src/main/java/com/github/steveice10/mc/protocol/packet/ingame/server/world/ServerWorldBorderPacket.java
View file

@ -19,63 +19,62 @@ import java.io.IOException;
public class ServerWorldBorderPacket implements Packet { public class ServerWorldBorderPacket implements Packet {
private @NonNull WorldBorderAction action; private @NonNull WorldBorderAction action;
private double radius; private double newSize;
private double oldRadius; private double oldSize;
private double newRadius; private long lerpTime;
private long speed;
private double centerX; private double newCenterX;
private double centerY; private double newCenterY;
private int portalTeleportBoundary; private int newAbsoluteMaxSize;
private int warningTime; private int warningTime;
private int warningBlocks; private int warningBlocks;
public ServerWorldBorderPacket(double radius) { public ServerWorldBorderPacket(double newSize) {
this.action = WorldBorderAction.SET_SIZE; this.action = WorldBorderAction.SET_SIZE;
this.radius = radius; this.newSize = newSize;
} }
public ServerWorldBorderPacket(double oldRadius, double newRadius, long speed) { public ServerWorldBorderPacket(double oldSize, double newSize, long lerpTime) {
this.action = WorldBorderAction.LERP_SIZE; this.action = WorldBorderAction.LERP_SIZE;
this.oldRadius = oldRadius; this.oldSize = oldSize;
this.newRadius = newRadius; this.newSize = newSize;
this.speed = speed; this.lerpTime = lerpTime;
} }
public ServerWorldBorderPacket(double centerX, double centerY) { public ServerWorldBorderPacket(double newCenterX, double newCenterY) {
this.action = WorldBorderAction.SET_CENTER; this.action = WorldBorderAction.SET_CENTER;
this.centerX = centerX; this.newCenterX = newCenterX;
this.centerY = centerY; this.newCenterY = newCenterY;
} }
public ServerWorldBorderPacket(boolean time, int warning) { public ServerWorldBorderPacket(boolean isTime, int warningValue) {
if(time) { if(isTime) {
this.action = WorldBorderAction.SET_WARNING_TIME; this.action = WorldBorderAction.SET_WARNING_TIME;
this.warningTime = warning; this.warningTime = warningValue;
} else { } else {
this.action = WorldBorderAction.SET_WARNING_BLOCKS; this.action = WorldBorderAction.SET_WARNING_BLOCKS;
this.warningBlocks = warning; this.warningBlocks = warningValue;
} }
} }
public ServerWorldBorderPacket(double centerX, double centerY, double oldRadius, double newRadius, long speed, int portalTeleportBoundary, int warningTime, int warningBlocks) { public ServerWorldBorderPacket(double newCenterX, double newCenterY, double oldSize, double newSize, long lerpTime, int newAbsoluteMaxSize, int warningTime, int warningBlocks) {
this.action = WorldBorderAction.INITIALIZE; this.action = WorldBorderAction.INITIALIZE;
this.centerX = centerX; this.newCenterX = newCenterX;
this.centerY = centerY; this.newCenterY = newCenterY;
this.oldRadius = oldRadius; this.oldSize = oldSize;
this.newRadius = newRadius; this.newSize = newSize;
this.speed = speed; this.lerpTime = lerpTime;
this.portalTeleportBoundary = portalTeleportBoundary; this.newAbsoluteMaxSize = newAbsoluteMaxSize;
this.warningTime = warningTime; this.warningTime = warningTime;
this.warningBlocks = warningBlocks; this.warningBlocks = warningBlocks;
} }
@ -84,21 +83,21 @@ public class ServerWorldBorderPacket implements Packet {
public void read(NetInput in) throws IOException { public void read(NetInput in) throws IOException {
this.action = MagicValues.key(WorldBorderAction.class, in.readVarInt()); this.action = MagicValues.key(WorldBorderAction.class, in.readVarInt());
if(this.action == WorldBorderAction.SET_SIZE) { if(this.action == WorldBorderAction.SET_SIZE) {
this.radius = in.readDouble(); this.newSize = in.readDouble();
} else if(this.action == WorldBorderAction.LERP_SIZE) { } else if(this.action == WorldBorderAction.LERP_SIZE) {
this.oldRadius = in.readDouble(); this.oldSize = in.readDouble();
this.newRadius = in.readDouble(); this.newSize = in.readDouble();
this.speed = in.readVarLong(); this.lerpTime = in.readVarLong();
} else if(this.action == WorldBorderAction.SET_CENTER) { } else if(this.action == WorldBorderAction.SET_CENTER) {
this.centerX = in.readDouble(); this.newCenterX = in.readDouble();
this.centerY = in.readDouble(); this.newCenterY = in.readDouble();
} else if(this.action == WorldBorderAction.INITIALIZE) { } else if(this.action == WorldBorderAction.INITIALIZE) {
this.centerX = in.readDouble(); this.newCenterX = in.readDouble();
this.centerY = in.readDouble(); this.newCenterY = in.readDouble();
this.oldRadius = in.readDouble(); this.oldSize = in.readDouble();
this.newRadius = in.readDouble(); this.newSize = in.readDouble();
this.speed = in.readVarLong(); this.lerpTime = in.readVarLong();
this.portalTeleportBoundary = in.readVarInt(); this.newAbsoluteMaxSize = in.readVarInt();
this.warningTime = in.readVarInt(); this.warningTime = in.readVarInt();
this.warningBlocks = in.readVarInt(); this.warningBlocks = in.readVarInt();
} else if(this.action == WorldBorderAction.SET_WARNING_TIME) { } else if(this.action == WorldBorderAction.SET_WARNING_TIME) {
@ -112,21 +111,21 @@ public class ServerWorldBorderPacket implements Packet {
public void write(NetOutput out) throws IOException { public void write(NetOutput out) throws IOException {
out.writeVarInt(MagicValues.value(Integer.class, this.action)); out.writeVarInt(MagicValues.value(Integer.class, this.action));
if(this.action == WorldBorderAction.SET_SIZE) { if(this.action == WorldBorderAction.SET_SIZE) {
out.writeDouble(this.radius); out.writeDouble(this.newSize);
} else if(this.action == WorldBorderAction.LERP_SIZE) { } else if(this.action == WorldBorderAction.LERP_SIZE) {
out.writeDouble(this.oldRadius); out.writeDouble(this.oldSize);
out.writeDouble(this.newRadius); out.writeDouble(this.newSize);
out.writeVarLong(this.speed); out.writeVarLong(this.lerpTime);
} else if(this.action == WorldBorderAction.SET_CENTER) { } else if(this.action == WorldBorderAction.SET_CENTER) {
out.writeDouble(this.centerX); out.writeDouble(this.newCenterX);
out.writeDouble(this.centerY); out.writeDouble(this.newCenterY);
} else if(this.action == WorldBorderAction.INITIALIZE) { } else if(this.action == WorldBorderAction.INITIALIZE) {
out.writeDouble(this.centerX); out.writeDouble(this.newCenterX);
out.writeDouble(this.centerY); out.writeDouble(this.newCenterY);
out.writeDouble(this.oldRadius); out.writeDouble(this.oldSize);
out.writeDouble(this.newRadius); out.writeDouble(this.newSize);
out.writeVarLong(this.speed); out.writeVarLong(this.lerpTime);
out.writeVarInt(this.portalTeleportBoundary); out.writeVarInt(this.newAbsoluteMaxSize);
out.writeVarInt(this.warningTime); out.writeVarInt(this.warningTime);
out.writeVarInt(this.warningBlocks); out.writeVarInt(this.warningBlocks);
} else if(this.action == WorldBorderAction.SET_WARNING_TIME) { } else if(this.action == WorldBorderAction.SET_WARNING_TIME) {