Skip to content

Commit 81daa62

Browse files
dmulloy2dmulloy2
committed
Update to 1.12-pre5
1 parent f99b977 commit 81daa62

File tree

3 files changed

+40
-44
lines changed

3 files changed

+40
-44
lines changed

‎modules/API/src/main/java/com/comphenix/protocol/PacketType.java‎

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -161,29 +161,30 @@ public static class Server extends ObjectEnum<PacketType> {
161161
public static final PacketType RESOURCE_PACK_SEND = new PacketType(PROTOCOL, SENDER, 0x34, 0x32, "ResourcePackSend");
162162
public static final PacketType RESPAWN = new PacketType(PROTOCOL, SENDER, 0x35, 0x33, "Respawn");
163163
public static final PacketType ENTITY_HEAD_ROTATION = new PacketType(PROTOCOL, SENDER, 0x36, 0x34, "EntityHeadRotation");
164-
public static final PacketType WORLD_BORDER = new PacketType(PROTOCOL, SENDER, 0x37, 0x35, "WorldBorder");
165-
public static final PacketType CAMERA = new PacketType(PROTOCOL, SENDER, 0x38, 0x36, "Camera");
166-
public static final PacketType HELD_ITEM_SLOT = new PacketType(PROTOCOL, SENDER, 0x39, 0x37, "HeldItemSlot");
167-
public static final PacketType SCOREBOARD_DISPLAY_OBJECTIVE = new PacketType(PROTOCOL, SENDER, 0x3A, 0x38, "ScoreboardDisplayObjective");
168-
public static final PacketType ENTITY_METADATA = new PacketType(PROTOCOL, SENDER, 0x3B, 0x39, "EntityMetadata");
169-
public static final PacketType ATTACH_ENTITY = new PacketType(PROTOCOL, SENDER, 0x3C, 0x3A, "AttachEntity");
170-
public static final PacketType ENTITY_VELOCITY = new PacketType(PROTOCOL, SENDER, 0x3D, 0x3B, "EntityVelocity");
171-
public static final PacketType ENTITY_EQUIPMENT = new PacketType(PROTOCOL, SENDER, 0x3E, 0x3C, "EntityEquipment");
172-
public static final PacketType EXPERIENCE = new PacketType(PROTOCOL, SENDER, 0x3F, 0x3D, "Experience");
173-
public static final PacketType UPDATE_HEALTH = new PacketType(PROTOCOL, SENDER, 0x40, 0x3E, "UpdateHealth");
174-
public static final PacketType SCOREBOARD_OBJECTIVE = new PacketType(PROTOCOL, SENDER, 0x41, 0x3F, "ScoreboardObjective");
175-
public static final PacketType MOUNT = new PacketType(PROTOCOL, SENDER, 0x42, 0x40, "Mount");
176-
public static final PacketType SCOREBOARD_TEAM = new PacketType(PROTOCOL, SENDER, 0x43, 0x41, "ScoreboardTeam");
177-
public static final PacketType SCOREBOARD_SCORE = new PacketType(PROTOCOL, SENDER, 0x44, 0x42, "ScoreboardScore");
178-
public static final PacketType SPAWN_POSITION = new PacketType(PROTOCOL, SENDER, 0x45, 0x43, "SpawnPosition");
179-
public static final PacketType UPDATE_TIME = new PacketType(PROTOCOL, SENDER, 0x46, 0x44, "UpdateTime");
180-
public static final PacketType TITLE = new PacketType(PROTOCOL, SENDER, 0x47, 0x45, "Title");
181-
public static final PacketType NAMED_SOUND_EFFECT = new PacketType(PROTOCOL, SENDER, 0x48, 0x46, "NamedSoundEffect");
182-
public static final PacketType PLAYER_LIST_HEADER_FOOTER = new PacketType(PROTOCOL, SENDER, 0x49, 0x47, "PlayerListHeaderFooter");
183-
public static final PacketType COLLECT = new PacketType(PROTOCOL, SENDER, 0x4A, 0x48, "Collect");
184-
public static final PacketType ENTITY_TELEPORT = new PacketType(PROTOCOL, SENDER, 0x4B, 0x49, "EntityTeleport");
185-
public static final PacketType UPDATE_ATTRIBUTES = new PacketType(PROTOCOL, SENDER, 0x4C, 0x4A, "UpdateAttributes");
186-
public static final PacketType ENTITY_EFFECT = new PacketType(PROTOCOL, SENDER, 0x4D, 0x4B, "EntityEffect");
164+
public static final PacketType SELECT_ADVANCEMENT_TAB = new PacketType(PROTOCOL, SENDER, 0x37, -1, "SelectAdvancementTab");
165+
public static final PacketType WORLD_BORDER = new PacketType(PROTOCOL, SENDER, 0x38, 0x35, "WorldBorder");
166+
public static final PacketType CAMERA = new PacketType(PROTOCOL, SENDER, 0x39, 0x36, "Camera");
167+
public static final PacketType HELD_ITEM_SLOT = new PacketType(PROTOCOL, SENDER, 0x3A, 0x37, "HeldItemSlot");
168+
public static final PacketType SCOREBOARD_DISPLAY_OBJECTIVE = new PacketType(PROTOCOL, SENDER, 0x3B, 0x38, "ScoreboardDisplayObjective");
169+
public static final PacketType ENTITY_METADATA = new PacketType(PROTOCOL, SENDER, 0x3C, 0x39, "EntityMetadata");
170+
public static final PacketType ATTACH_ENTITY = new PacketType(PROTOCOL, SENDER, 0x3D, 0x3A, "AttachEntity");
171+
public static final PacketType ENTITY_VELOCITY = new PacketType(PROTOCOL, SENDER, 0x3E, 0x3B, "EntityVelocity");
172+
public static final PacketType ENTITY_EQUIPMENT = new PacketType(PROTOCOL, SENDER, 0x3F, 0x3C, "EntityEquipment");
173+
public static final PacketType EXPERIENCE = new PacketType(PROTOCOL, SENDER, 0x40, 0x3D, "Experience");
174+
public static final PacketType UPDATE_HEALTH = new PacketType(PROTOCOL, SENDER, 0x41, 0x3E, "UpdateHealth");
175+
public static final PacketType SCOREBOARD_OBJECTIVE = new PacketType(PROTOCOL, SENDER, 0x42, 0x3F, "ScoreboardObjective");
176+
public static final PacketType MOUNT = new PacketType(PROTOCOL, SENDER, 0x43, 0x40, "Mount");
177+
public static final PacketType SCOREBOARD_TEAM = new PacketType(PROTOCOL, SENDER, 0x44, 0x41, "ScoreboardTeam");
178+
public static final PacketType SCOREBOARD_SCORE = new PacketType(PROTOCOL, SENDER, 0x45, 0x42, "ScoreboardScore");
179+
public static final PacketType SPAWN_POSITION = new PacketType(PROTOCOL, SENDER, 0x46, 0x43, "SpawnPosition");
180+
public static final PacketType UPDATE_TIME = new PacketType(PROTOCOL, SENDER, 0x47, 0x44, "UpdateTime");
181+
public static final PacketType TITLE = new PacketType(PROTOCOL, SENDER, 0x48, 0x45, "Title");
182+
public static final PacketType NAMED_SOUND_EFFECT = new PacketType(PROTOCOL, SENDER, 0x49, 0x46, "NamedSoundEffect");
183+
public static final PacketType PLAYER_LIST_HEADER_FOOTER = new PacketType(PROTOCOL, SENDER, 0x4A, 0x47, "PlayerListHeaderFooter");
184+
public static final PacketType COLLECT = new PacketType(PROTOCOL, SENDER, 0x4B, 0x48, "Collect");
185+
public static final PacketType ENTITY_TELEPORT = new PacketType(PROTOCOL, SENDER, 0x4C, 0x49, "EntityTeleport");
186+
public static final PacketType UPDATE_ATTRIBUTES = new PacketType(PROTOCOL, SENDER, 0x4D, 0x4A, "UpdateAttributes");
187+
public static final PacketType ENTITY_EFFECT = new PacketType(PROTOCOL, SENDER, 0x4E, 0x4B, "EntityEffect");
187188

188189
// ---- Removed in 1.9
189190

@@ -208,33 +209,33 @@ public static class Server extends ObjectEnum<PacketType> {
208209
// ----- Renamed packets
209210

210211
/**
211-
* @deprecated Renamed to {@link WINDOW_DATA}
212+
* @deprecated Renamed to {@link #WINDOW_DATA}
212213
*/
213214
@Deprecated
214215
public static final PacketType CRAFT_PROGRESS_BAR = WINDOW_DATA.deprecated();
215216

216217
/**
217-
* @deprecated Renamed to {@link REL_ENTITY_MOVE_LOOK}
218+
* @deprecated Renamed to {@link #REL_ENTITY_MOVE_LOOK}
218219
*/
219220
@Deprecated
220221
public static final PacketType ENTITY_MOVE_LOOK = REL_ENTITY_MOVE_LOOK.deprecated();
221222

222223
/**
223-
* @deprecated Renamed to {@link STATISTIC}
224+
* @deprecated Renamed to {@link #STATISTIC}
224225
*/
225226
@Deprecated
226227
public static final PacketType STATISTICS = STATISTIC.deprecated();
227228

228229
/**
229-
* @deprecated Renamed to {@link OPEN_SIGN_EDITOR}
230+
* @deprecated Renamed to {@link #OPEN_SIGN_EDITOR}
230231
*/
231232
@Deprecated
232233
public static final PacketType OPEN_SIGN_ENTITY = OPEN_SIGN_EDITOR.deprecated();
233234

234235
// ----- Replaced in 1.9.4
235236

236237
/**
237-
* @deprecated Replaced by {@link TILE_ENTITY_DATA}
238+
* @deprecated Replaced by {@link #TILE_ENTITY_DATA}
238239
*/
239240
@Deprecated
240241
public static final PacketType UPDATE_SIGN = MinecraftReflection.signUpdateExists() ? new PacketType(PROTOCOL, SENDER, 252, 252, "UpdateSign") :
@@ -285,13 +286,14 @@ public static class Client extends ObjectEnum<PacketType> {
285286
public static final PacketType STEER_VEHICLE = new PacketType(PROTOCOL, SENDER, 0x16, 0x15, "SteerVehicle");
286287
public static final PacketType RECIPE_DISPLAYED = new PacketType(PROTOCOL, SENDER, 0x17, 0x17, "RecipeDisplayed");
287288
public static final PacketType RESOURCE_PACK_STATUS = new PacketType(PROTOCOL, SENDER, 0x18, 0x16, "ResourcePackStatus");
288-
public static final PacketType HELD_ITEM_SLOT = new PacketType(PROTOCOL, SENDER, 0x19, 0x17, "HeldItemSlot");
289-
public static final PacketType SET_CREATIVE_SLOT = new PacketType(PROTOCOL, SENDER, 0x1A, 0x18, "SetCreativeSlot");
290-
public static final PacketType UPDATE_SIGN = new PacketType(PROTOCOL, SENDER, 0x1B, 0x19, "UpdateSign");
291-
public static final PacketType ARM_ANIMATION = new PacketType(PROTOCOL, SENDER, 0x1C, 0x1A, "ArmAnimation");
292-
public static final PacketType SPECTATE = new PacketType(PROTOCOL, SENDER, 0x1D, 0x1B, "Spectate");
293-
public static final PacketType USE_ITEM = new PacketType(PROTOCOL, SENDER, 0x1E, 0x1C, "UseItem");
294-
public static final PacketType BLOCK_PLACE = new PacketType(PROTOCOL, SENDER, 0x1F, 0x1D, "BlockPlace");
289+
public static final PacketType ADVANCEMENTS = new PacketType(PROTOCOL, SENDER, 0x19, -1, "Advancements");
290+
public static final PacketType HELD_ITEM_SLOT = new PacketType(PROTOCOL, SENDER, 0x1A, 0x17, "HeldItemSlot");
291+
public static final PacketType SET_CREATIVE_SLOT = new PacketType(PROTOCOL, SENDER, 0x1B, 0x18, "SetCreativeSlot");
292+
public static final PacketType UPDATE_SIGN = new PacketType(PROTOCOL, SENDER, 0x1C, 0x19, "UpdateSign");
293+
public static final PacketType ARM_ANIMATION = new PacketType(PROTOCOL, SENDER, 0x1D, 0x1A, "ArmAnimation");
294+
public static final PacketType SPECTATE = new PacketType(PROTOCOL, SENDER, 0x1E, 0x1B, "Spectate");
295+
public static final PacketType USE_ITEM = new PacketType(PROTOCOL, SENDER, 0x1F, 0x1C, "UseItem");
296+
public static final PacketType BLOCK_PLACE = new PacketType(PROTOCOL, SENDER, 0x20, 0x1D, "BlockPlace");
295297

296298
private final static Client INSTANCE = new Client();
297299

@@ -329,7 +331,7 @@ public static class Server extends ObjectEnum<PacketType> {
329331
public static final PacketType PONG = new PacketType(PROTOCOL, SENDER, 0x01, 0x01, "Pong");
330332

331333
/**
332-
* @deprecated Replaced by {@link SERVER_INFO}
334+
* @deprecated Replaced by {@link #SERVER_INFO}
333335
*/
334336
@Deprecated
335337
public static final PacketType OUT_SERVER_INFO = SERVER_INFO.deprecated();

‎modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelInjector.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
270270
originalChannel.pipeline().addBefore("protocol_lib_decoder", "protocol_lib_finish", finishHandler);
271271
originalChannel.pipeline().addAfter("encoder", "protocol_lib_encoder", protocolEncoder);
272272

273-
try {
274273
// Intercept all write methods
275274
channelField.setValue(new ChannelProxy(originalChannel, MinecraftReflection.getPacketClass()) {
276275
// Compatibility with Spigot 1.8
@@ -362,9 +361,6 @@ protected PacketEvent handleScheduled(Object instance, FieldAccessor accessor) {
362361
return event != null ? event : BYPASSED_PACKET;
363362
}
364363
});
365-
} catch (Throwable ex) {
366-
throw new RuntimeException("Failed to overwrite channel field", ex);
367-
}
368364

369365
injected = true;
370366
return true;
@@ -602,7 +598,6 @@ protected void handleLogin(Class<?> packetClass, Object packet) {
602598
try {
603599
PACKET_SET_PROTOCOL = PacketType.Handshake.Client.SET_PROTOCOL.getPacketClass();
604600
} catch (Throwable ex) {
605-
ex.printStackTrace(); // TODO debug
606601
PACKET_SET_PROTOCOL = getClass(); // If we can't find it don't worry about it
607602
}
608603
}
@@ -611,10 +606,9 @@ protected void handleLogin(Class<?> packetClass, Object packet) {
611606
FuzzyReflection fuzzy = FuzzyReflection.fromObject(packet);
612607
try {
613608
int protocol = (int) fuzzy.invokeMethod(packet, "getProtocol", int.class);
614-
System.out.println("Determined protocol " + protocol);
615609
originalChannel.attr(PROTOCOL_KEY).set(protocol);
616610
} catch (Throwable ex) {
617-
ex.printStackTrace(); // TODO debug
611+
// Oh well
618612
}
619613
}
620614
}

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1111
<minorVersion>4.3.0-SNAPSHOT</minorVersion>
12-
<spigotVersion>1.12-pre2-SNAPSHOT</spigotVersion>
12+
<spigotVersion>1.12-pre5-SNAPSHOT</spigotVersion>
1313
</properties>
1414

1515
<modules>

0 commit comments

Comments
 (0)