Skip to content

Commit

Permalink
Update to Minecraft 1.12-pre7.
Browse files Browse the repository at this point in the history 
Best guess for 1.12 support
  • Loading branch information
@aet2505
aet2505 committed May 31, 2017
1 parent daa0cf5 commit e30f68e
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 22 deletions.
45 changes: 24 additions & 21 deletions protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,121 +61,121 @@ public enum Protocol
KeepAlive.class,
map( ProtocolConstants.MINECRAFT_1_8, 0x00 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x1F ),
map( ProtocolConstants.MINECRAFT_1_12, 0x1F )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x1F )
);
TO_CLIENT.registerPacket(
Login.class,
map( ProtocolConstants.MINECRAFT_1_8, 0x01 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x23 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x23 )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x23 )
);
TO_CLIENT.registerPacket(
Chat.class,
map( ProtocolConstants.MINECRAFT_1_8, 0x02 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x0F ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0F )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x0F )
);
TO_CLIENT.registerPacket(
Respawn.class,
map( ProtocolConstants.MINECRAFT_1_8, 0x07 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x33 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x34 )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x34 )
);
TO_CLIENT.registerPacket(
BossBar.class,
map( ProtocolConstants.MINECRAFT_1_9, 0x0C ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0C )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x0C )
);
TO_CLIENT.registerPacket(
PlayerListItem.class, // PlayerInfo
map( ProtocolConstants.MINECRAFT_1_8, 0x38 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x2D ),
map( ProtocolConstants.MINECRAFT_1_12, 0x2D )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x2D )
);
TO_CLIENT.registerPacket(
TabCompleteResponse.class,
map( ProtocolConstants.MINECRAFT_1_8, 0x3A ),
map( ProtocolConstants.MINECRAFT_1_9, 0x0E ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0E )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x0E )
);
TO_CLIENT.registerPacket(
ScoreboardObjective.class,
map( ProtocolConstants.MINECRAFT_1_8, 0x3B ),
map( ProtocolConstants.MINECRAFT_1_9, 0x3F ),
map( ProtocolConstants.MINECRAFT_1_12, 0x41 )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x41 )
);
TO_CLIENT.registerPacket(
ScoreboardScore.class,
map( ProtocolConstants.MINECRAFT_1_8, 0x3C ),
map( ProtocolConstants.MINECRAFT_1_9, 0x42 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x44 )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x44 )
);
TO_CLIENT.registerPacket(
ScoreboardDisplay.class,
map( ProtocolConstants.MINECRAFT_1_8, 0x3D ),
map( ProtocolConstants.MINECRAFT_1_9, 0x38 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x3A )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x3A )
);
TO_CLIENT.registerPacket(
Team.class,
map( ProtocolConstants.MINECRAFT_1_8, 0x3E ),
map( ProtocolConstants.MINECRAFT_1_9, 0x41 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x43 )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x43 )
);
TO_CLIENT.registerPacket(
PluginMessage.class,
map( ProtocolConstants.MINECRAFT_1_8, 0x3F ),
map( ProtocolConstants.MINECRAFT_1_9, 0x18 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x18 )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x18 )
);
TO_CLIENT.registerPacket(
Kick.class,
map( ProtocolConstants.MINECRAFT_1_8, 0x40 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x1A ),
map( ProtocolConstants.MINECRAFT_1_12, 0x1A )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x1A )
);
TO_CLIENT.registerPacket(
Title.class,
map( ProtocolConstants.MINECRAFT_1_8, 0x45 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x47 )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x47 )
);
TO_CLIENT.registerPacket(
PlayerListHeaderFooter.class,
map( ProtocolConstants.MINECRAFT_1_8, 0x47 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x48 ),
map( ProtocolConstants.MINECRAFT_1_9_4, 0x47 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x49 )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x49 )
);

TO_SERVER.registerPacket(
KeepAlive.class,
map( ProtocolConstants.MINECRAFT_1_8, 0x00 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x0B ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0C )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x0C )
);
TO_SERVER.registerPacket(
Chat.class,
map( ProtocolConstants.MINECRAFT_1_8, 0x01 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x02 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x03 )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x03 )
);
TO_SERVER.registerPacket(
TabCompleteRequest.class,
map( ProtocolConstants.MINECRAFT_1_8, 0x14 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x01 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x02 )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x02 )
);
TO_SERVER.registerPacket(
ClientSettings.class,
map( ProtocolConstants.MINECRAFT_1_8, 0x15 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x04 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x05 )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x05 )
);
TO_SERVER.registerPacket(
PluginMessage.class,
map( ProtocolConstants.MINECRAFT_1_8, 0x17 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x09 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0A )
map( ProtocolConstants.MINECRAFT_1_12_PRE, 0x0A )
);
}
},
Expand Down Expand Up @@ -309,7 +309,7 @@ public static class DirectionData
{
linkedProtocols.put( ProtocolConstants.MINECRAFT_1_8, Arrays.asList(
ProtocolConstants.MINECRAFT_1_9,
ProtocolConstants.MINECRAFT_1_12
ProtocolConstants.MINECRAFT_1_12_PRE
) );
linkedProtocols.put( ProtocolConstants.MINECRAFT_1_9, Arrays.asList(
ProtocolConstants.MINECRAFT_1_9_1,
Expand All @@ -321,6 +321,9 @@ public static class DirectionData
ProtocolConstants.MINECRAFT_1_11,
ProtocolConstants.MINECRAFT_1_11_1
) );
linkedProtocols.put( ProtocolConstants.MINECRAFT_1_12_PRE, Arrays.asList(
ProtocolConstants.MINECRAFT_1_12
) );
}

@Getter
Expand Down
4 changes: 3 additions & 1 deletion protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ public class ProtocolConstants
public static final int MINECRAFT_1_10 = 210;
public static final int MINECRAFT_1_11 = 315;
public static final int MINECRAFT_1_11_1 = 316;
public static final int MINECRAFT_1_12 = 333;
public static final int MINECRAFT_1_12_PRE = 334;
public static final int MINECRAFT_1_12 = 335; //A best guess may need to alter for Friday
public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
"1.8.x",
"1.9.x",
Expand All @@ -30,6 +31,7 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_10,
ProtocolConstants.MINECRAFT_1_11,
ProtocolConstants.MINECRAFT_1_11_1,
ProtocolConstants.MINECRAFT_1_12_PRE,
ProtocolConstants.MINECRAFT_1_12
);

Expand Down
1 change: 1 addition & 0 deletions proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public static EntityMap getEntityMap(int version)
case ProtocolConstants.MINECRAFT_1_11:
case ProtocolConstants.MINECRAFT_1_11_1:
return EntityMap_1_11.INSTANCE;
case ProtocolConstants.MINECRAFT_1_12_PRE:
case ProtocolConstants.MINECRAFT_1_12:
return EntityMap_1_12.INSTANCE;
}
Expand Down

0 comments on commit e30f68e

Please sign in to comment.