From 0dc580ee23129f765cba1b3987898a28aa9632ed Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 24 Jun 2019 17:43:41 +0200 Subject: [PATCH] Update to 1.14.3 --- pom.xml | 2 +- .../steveice10/mc/protocol/MinecraftConstants.java | 4 ++-- .../ingame/server/window/ServerTradeListPacket.java | 10 +++++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 379c3de3..214ca152 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.steveice10 mcprotocollib - 1.14.2-SNAPSHOT + 1.14.3-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 ce43e953..05d696b8 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.14.2"; - public static final int PROTOCOL_VERSION = 485; + public static final String GAME_VERSION = "1.14.3"; + public static final int PROTOCOL_VERSION = 490; // General Key Constants public static final String PROFILE_KEY = "profile"; diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/server/window/ServerTradeListPacket.java b/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/server/window/ServerTradeListPacket.java index c90994b0..83c89f20 100644 --- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/server/window/ServerTradeListPacket.java +++ b/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/server/window/ServerTradeListPacket.java @@ -16,16 +16,18 @@ public class ServerTradeListPacket extends MinecraftPacket { private int villagerLevel; private int experience; private boolean isRegularVillager; + private boolean canRestock; public ServerTradeListPacket() { } - public ServerTradeListPacket(int windowId, VillagerTrade[] trades, int villagerLevel, int experience, boolean isRegularVillager) { + public ServerTradeListPacket(int windowId, VillagerTrade[] trades, int villagerLevel, int experience, boolean isRegularVillager, boolean canRestock) { this.windowId = windowId; this.trades = trades; this.villagerLevel = villagerLevel; this.experience = experience; this.isRegularVillager = isRegularVillager; + this.canRestock = canRestock; } public int getWindowId() { @@ -48,6 +50,10 @@ public class ServerTradeListPacket extends MinecraftPacket { return isRegularVillager; } + public boolean canRestock() { + return canRestock; + } + @Override public void read(NetInput in) throws IOException { this.windowId = in.readVarInt(); @@ -76,6 +82,7 @@ public class ServerTradeListPacket extends MinecraftPacket { this.villagerLevel = in.readVarInt(); this.experience = in.readVarInt(); this.isRegularVillager = in.readBoolean(); + this.canRestock = in.readBoolean(); } @Override @@ -106,5 +113,6 @@ public class ServerTradeListPacket extends MinecraftPacket { out.writeVarInt(this.villagerLevel); out.writeVarInt(this.experience); out.writeBoolean(this.isRegularVillager); + out.writeBoolean(this.canRestock); } }