From f9c86c5aa5dda9dea0faeedd22bf11db8ec31839 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Tue, 19 Sep 2017 09:13:00 +0200 Subject: [PATCH] Update to MC 1.12.2 --- pom.xml | 2 +- .../steveice10/mc/protocol/MinecraftConstants.java | 4 ++-- .../packet/ingame/client/ClientKeepAlivePacket.java | 10 +++++----- .../packet/ingame/server/ServerKeepAlivePacket.java | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 758977d6..52f2fdc4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.github.steveice10 mcprotocollib - 1.12.1-1 + 1.12.2-1-SNAPSHOT jar MCProtocolLib diff --git a/src/main/java/com/github/steveice10/mc/protocol/MinecraftConstants.java b/src/main/java/com/github/steveice10/mc/protocol/MinecraftConstants.java index 68ac9fd2..ea7db1a6 100644 --- a/src/main/java/com/github/steveice10/mc/protocol/MinecraftConstants.java +++ b/src/main/java/com/github/steveice10/mc/protocol/MinecraftConstants.java @@ -2,8 +2,8 @@ package com.github.steveice10.mc.protocol; public class MinecraftConstants { // General Constants - public static final String GAME_VERSION = "1.12.1"; - public static final int PROTOCOL_VERSION = 338; + public static final String GAME_VERSION = "1.12.2"; + public static final int PROTOCOL_VERSION = 340; // General Key Constants public static final String PROFILE_KEY = "profile"; diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/client/ClientKeepAlivePacket.java b/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/client/ClientKeepAlivePacket.java index 719d5f02..649d5845 100644 --- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/client/ClientKeepAlivePacket.java +++ b/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/client/ClientKeepAlivePacket.java @@ -7,27 +7,27 @@ import com.github.steveice10.packetlib.io.NetOutput; import java.io.IOException; public class ClientKeepAlivePacket extends MinecraftPacket { - private int id; + private long id; @SuppressWarnings("unused") private ClientKeepAlivePacket() { } - public ClientKeepAlivePacket(int id) { + public ClientKeepAlivePacket(long id) { this.id = id; } - public int getPingId() { + public long getPingId() { return this.id; } @Override public void read(NetInput in) throws IOException { - this.id = in.readVarInt(); + this.id = in.readLong(); } @Override public void write(NetOutput out) throws IOException { - out.writeVarInt(this.id); + out.writeLong(this.id); } } diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/server/ServerKeepAlivePacket.java b/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/server/ServerKeepAlivePacket.java index cc3c2a63..ed542267 100644 --- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/server/ServerKeepAlivePacket.java +++ b/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/server/ServerKeepAlivePacket.java @@ -7,27 +7,27 @@ import com.github.steveice10.packetlib.io.NetOutput; import java.io.IOException; public class ServerKeepAlivePacket extends MinecraftPacket { - private int id; + private long id; @SuppressWarnings("unused") private ServerKeepAlivePacket() { } - public ServerKeepAlivePacket(int id) { + public ServerKeepAlivePacket(long id) { this.id = id; } - public int getPingId() { + public long getPingId() { return this.id; } @Override public void read(NetInput in) throws IOException { - this.id = in.readVarInt(); + this.id = in.readLong(); } @Override public void write(NetOutput out) throws IOException { - out.writeVarInt(this.id); + out.writeLong(this.id); } }