AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-16 10:55:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

new packet mapping (13w41b - 1.8.9)

Browse Source
This commit is contained in:
Bixilon 2020-07-31 23:54:05 +02:00
parent 3669fa1dee
commit b3ff2a3437
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
15 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/de/bixilon/minosoft/game/datatypes/objectLoader/versions/Version.java
View File

@ -75,6 +75,7 @@ public class Version {
return clientboundPacketMapping.get(packet);
}
public HashBiMap<Packets.Clientbound, Integer> getClientboundPacketMapping() {
return clientboundPacketMapping;
}

13
src/main/java/de/bixilon/minosoft/game/datatypes/objectLoader/versions/Versions.java
View File

@ -14,6 +14,7 @@
package de.bixilon.minosoft.game.datatypes.objectLoader.versions;
import com.google.common.collect.HashBiMap;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import de.bixilon.minosoft.game.datatypes.Mappings;
import de.bixilon.minosoft.protocol.protocol.Packets;
@ -60,12 +61,15 @@ public class Versions {
} else {
JsonObject mappingJson = versionJson.getAsJsonObject("mapping");
serverboundPacketMapping = HashBiMap.create();
for (String packetName : mappingJson.getAsJsonObject("serverbound").keySet()) {
serverboundPacketMapping.put(Packets.Serverbound.valueOf(packetName), mappingJson.getAsJsonObject("serverbound").get(packetName).getAsInt());
for (JsonElement packetElement : mappingJson.getAsJsonArray("serverbound")) {
String packetName = packetElement.getAsString();
serverboundPacketMapping.put(Packets.Serverbound.valueOf(packetName), serverboundPacketMapping.size());
}
clientboundPacketMapping = HashBiMap.create();
for (String packetName : mappingJson.getAsJsonObject("clientbound").keySet()) {
clientboundPacketMapping.put(Packets.Clientbound.valueOf(packetName), mappingJson.getAsJsonObject("clientbound").get(packetName).getAsInt());
for (JsonElement packetElement : mappingJson.getAsJsonArray("clientbound")) {
String packetName = packetElement.getAsString();
clientboundPacketMapping.put(Packets.Clientbound.valueOf(packetName), clientboundPacketMapping.size());
}
}
Version version = new Version(versionName, protocolId, serverboundPacketMapping, clientboundPacketMapping);
@ -89,4 +93,5 @@ public class Versions {
version.unload();
}
}
}

11
src/main/java/de/bixilon/minosoft/protocol/protocol/Packets.java
View File

@ -69,7 +69,8 @@ public class Packets {
PLAY_UPDATE_COMMAND_BLOCK_MINECART,
PLAY_GENERATE_STRUCTURE,
PLAY_SET_DISPLAYED_RECIPE,
PLAY_SET_RECIPE_BOOK_STATE;
PLAY_SET_RECIPE_BOOK_STATE,
PLAY_PLAYER_GROUND_CHANGE;
final ConnectionState state;
@ -140,7 +141,7 @@ public class Packets {
PLAY_CRAFT_RECIPE_RESPONSE,
PLAY_PLAYER_ABILITIES,
PLAY_COMBAT_EVENT,
PLAY_PLAYER_INFO,
PLAY_PLAYER_LIST_ITEM,
PLAY_FACE_PLAYER,
PLAY_PLAYER_POSITION_AND_ROTATION,
PLAY_UNLOCK_RECIPES,
@ -170,7 +171,7 @@ public class Packets {
PLAY_ENTITY_SOUND_EFFECT,
PLAY_SOUND_EFFECT,
PLAY_STOP_SOUND,
PLAY_LIST_HEADER_AND_FOOTER,
PLAY_PLAYER_LIST_HEADER_AND_FOOTER,
PLAY_NBT_QUERY_RESPONSE,
PLAY_COLLECT_ITEM,
PLAY_ENTITY_TELEPORT,
@ -185,7 +186,9 @@ public class Packets {
PLAY_UPDATE_SIGN,
PLAY_STATISTICS,
PLAY_SPAWN_ENTITY,
PLAY_TITLE;
PLAY_TITLE,
PLAY_ENTITY_INITIALISATION,
PLAY_SET_COMPRESSION;
final ConnectionState state;

4
src/main/java/de/bixilon/minosoft/protocol/protocol/Protocol.java
View File

@ -35,7 +35,7 @@ public abstract class Protocol implements ProtocolInterface {
packetClassMapping.put(Packets.Clientbound.LOGIN_PLUGIN_REQUEST, PacketLoginPluginRequest.class);
packetClassMapping.put(Packets.Clientbound.PLAY_JOIN_GAME, PacketJoinGame.class);
packetClassMapping.put(Packets.Clientbound.PLAY_PLAYER_INFO, PacketPlayerInfo.class);
packetClassMapping.put(Packets.Clientbound.PLAY_PLAYER_LIST_ITEM, PacketPlayerInfo.class);
packetClassMapping.put(Packets.Clientbound.PLAY_TIME_UPDATE, PacketTimeUpdate.class);
packetClassMapping.put(Packets.Clientbound.PLAY_KEEP_ALIVE, PacketKeepAlive.class);
packetClassMapping.put(Packets.Clientbound.PLAY_CHUNK_BULK, PacketChunkBulk.class);
@ -96,7 +96,7 @@ public abstract class Protocol implements ProtocolInterface {
packetClassMapping.put(Packets.Clientbound.PLAY_DISPLAY_SCOREBOARD, PacketScoreboardDisplayScoreboard.class);
packetClassMapping.put(Packets.Clientbound.PLAY_MAP_DATA, PacketMapData.class);
packetClassMapping.put(Packets.Clientbound.PLAY_SERVER_DIFFICULTY, PacketServerDifficulty.class);
packetClassMapping.put(Packets.Clientbound.PLAY_LIST_HEADER_AND_FOOTER, PacketTabHeaderAndFooter.class);
packetClassMapping.put(Packets.Clientbound.PLAY_PLAYER_LIST_HEADER_AND_FOOTER, PacketTabHeaderAndFooter.class);
packetClassMapping.put(Packets.Clientbound.PLAY_RESOURCE_PACK_SEND, PackerResourcePackSend.class);
packetClassMapping.put(Packets.Clientbound.PLAY_ENTITY_PROPERTIES, PacketEntityProperties.class);
packetClassMapping.put(Packets.Clientbound.PLAY_WORLD_BORDER, PacketWorldBorder.class);

4
src/main/java/de/bixilon/minosoft/protocol/protocol/versions/Protocol_1_10.java
View File

@ -67,7 +67,7 @@ public class Protocol_1_10 extends Protocol {
registerPacket(Packets.Clientbound.PLAY_OPEN_SIGN_EDITOR);
registerPacket(Packets.Clientbound.PLAY_PLAYER_ABILITIES);
registerPacket(Packets.Clientbound.PLAY_COMBAT_EVENT);
registerPacket(Packets.Clientbound.PLAY_PLAYER_INFO);
registerPacket(Packets.Clientbound.PLAY_PLAYER_LIST_ITEM);
registerPacket(Packets.Clientbound.PLAY_PLAYER_POSITION_AND_ROTATION);
registerPacket(Packets.Clientbound.PLAY_USE_BED);
registerPacket(Packets.Clientbound.PLAY_DESTROY_ENTITIES);
@ -93,7 +93,7 @@ public class Protocol_1_10 extends Protocol {
registerPacket(Packets.Clientbound.PLAY_TIME_UPDATE);
registerPacket(Packets.Clientbound.PLAY_TITLE);
registerPacket(Packets.Clientbound.PLAY_SOUND_EFFECT);
registerPacket(Packets.Clientbound.PLAY_LIST_HEADER_AND_FOOTER);
registerPacket(Packets.Clientbound.PLAY_PLAYER_LIST_HEADER_AND_FOOTER);
registerPacket(Packets.Clientbound.PLAY_COLLECT_ITEM);
registerPacket(Packets.Clientbound.PLAY_ENTITY_TELEPORT);
registerPacket(Packets.Clientbound.PLAY_ENTITY_PROPERTIES);

4
src/main/java/de/bixilon/minosoft/protocol/protocol/versions/Protocol_1_11_2.java
View File

@ -65,7 +65,7 @@ public class Protocol_1_11_2 extends Protocol {
registerPacket(Packets.Clientbound.PLAY_OPEN_SIGN_EDITOR);
registerPacket(Packets.Clientbound.PLAY_PLAYER_ABILITIES);
registerPacket(Packets.Clientbound.PLAY_COMBAT_EVENT);
registerPacket(Packets.Clientbound.PLAY_PLAYER_INFO);
registerPacket(Packets.Clientbound.PLAY_PLAYER_LIST_ITEM);
registerPacket(Packets.Clientbound.PLAY_PLAYER_POSITION_AND_ROTATION);
registerPacket(Packets.Clientbound.PLAY_USE_BED);
registerPacket(Packets.Clientbound.PLAY_DESTROY_ENTITIES);
@ -91,7 +91,7 @@ public class Protocol_1_11_2 extends Protocol {
registerPacket(Packets.Clientbound.PLAY_TIME_UPDATE);
registerPacket(Packets.Clientbound.PLAY_TITLE);
registerPacket(Packets.Clientbound.PLAY_SOUND_EFFECT);
registerPacket(Packets.Clientbound.PLAY_LIST_HEADER_AND_FOOTER);
registerPacket(Packets.Clientbound.PLAY_PLAYER_LIST_HEADER_AND_FOOTER);
registerPacket(Packets.Clientbound.PLAY_COLLECT_ITEM);
registerPacket(Packets.Clientbound.PLAY_ENTITY_TELEPORT);
registerPacket(Packets.Clientbound.PLAY_ENTITY_PROPERTIES);

4
src/main/java/de/bixilon/minosoft/protocol/protocol/versions/Protocol_1_12_2.java
View File

@ -68,7 +68,7 @@ public class Protocol_1_12_2 extends Protocol {
registerPacket(Packets.Clientbound.PLAY_CRAFT_RECIPE_RESPONSE);
registerPacket(Packets.Clientbound.PLAY_PLAYER_ABILITIES);
registerPacket(Packets.Clientbound.PLAY_COMBAT_EVENT);
registerPacket(Packets.Clientbound.PLAY_PLAYER_INFO);
registerPacket(Packets.Clientbound.PLAY_PLAYER_LIST_ITEM);
registerPacket(Packets.Clientbound.PLAY_PLAYER_POSITION_AND_ROTATION);
registerPacket(Packets.Clientbound.PLAY_USE_BED);
registerPacket(Packets.Clientbound.PLAY_UNLOCK_RECIPES);
@ -96,7 +96,7 @@ public class Protocol_1_12_2 extends Protocol {
registerPacket(Packets.Clientbound.PLAY_TIME_UPDATE);
registerPacket(Packets.Clientbound.PLAY_TITLE);
registerPacket(Packets.Clientbound.PLAY_SOUND_EFFECT);
registerPacket(Packets.Clientbound.PLAY_LIST_HEADER_AND_FOOTER);
registerPacket(Packets.Clientbound.PLAY_PLAYER_LIST_HEADER_AND_FOOTER);
registerPacket(Packets.Clientbound.PLAY_COLLECT_ITEM);
registerPacket(Packets.Clientbound.PLAY_ENTITY_TELEPORT);
registerPacket(Packets.Clientbound.PLAY_ADVANCEMENTS);

4
src/main/java/de/bixilon/minosoft/protocol/protocol/versions/Protocol_1_13_2.java
View File

@ -69,7 +69,7 @@ public class Protocol_1_13_2 extends Protocol {
registerPacket(Packets.Clientbound.PLAY_CRAFT_RECIPE_RESPONSE);
registerPacket(Packets.Clientbound.PLAY_PLAYER_ABILITIES);
registerPacket(Packets.Clientbound.PLAY_COMBAT_EVENT);
registerPacket(Packets.Clientbound.PLAY_PLAYER_INFO);
registerPacket(Packets.Clientbound.PLAY_PLAYER_LIST_ITEM);
registerPacket(Packets.Clientbound.PLAY_FACE_PLAYER);
registerPacket(Packets.Clientbound.PLAY_PLAYER_POSITION_AND_ROTATION);
registerPacket(Packets.Clientbound.PLAY_USE_BED);
@ -99,7 +99,7 @@ public class Protocol_1_13_2 extends Protocol {
registerPacket(Packets.Clientbound.PLAY_TITLE);
registerPacket(Packets.Clientbound.PLAY_STOP_SOUND);
registerPacket(Packets.Clientbound.PLAY_SOUND_EFFECT);
registerPacket(Packets.Clientbound.PLAY_LIST_HEADER_AND_FOOTER);
registerPacket(Packets.Clientbound.PLAY_PLAYER_LIST_HEADER_AND_FOOTER);
registerPacket(Packets.Clientbound.PLAY_COLLECT_ITEM);
registerPacket(Packets.Clientbound.PLAY_ENTITY_TELEPORT);
registerPacket(Packets.Clientbound.PLAY_ADVANCEMENTS);

4
src/main/java/de/bixilon/minosoft/protocol/protocol/versions/Protocol_1_14_4.java
View File

@ -71,7 +71,7 @@ public class Protocol_1_14_4 extends Protocol {
registerPacket(Packets.Clientbound.PLAY_CRAFT_RECIPE_RESPONSE);
registerPacket(Packets.Clientbound.PLAY_PLAYER_ABILITIES);
registerPacket(Packets.Clientbound.PLAY_COMBAT_EVENT);
registerPacket(Packets.Clientbound.PLAY_PLAYER_INFO);
registerPacket(Packets.Clientbound.PLAY_PLAYER_LIST_ITEM);
registerPacket(Packets.Clientbound.PLAY_FACE_PLAYER);
registerPacket(Packets.Clientbound.PLAY_PLAYER_POSITION_AND_ROTATION);
registerPacket(Packets.Clientbound.PLAY_UNLOCK_RECIPES);
@ -103,7 +103,7 @@ public class Protocol_1_14_4 extends Protocol {
registerPacket(Packets.Clientbound.PLAY_ENTITY_SOUND_EFFECT);
registerPacket(Packets.Clientbound.PLAY_SOUND_EFFECT);
registerPacket(Packets.Clientbound.PLAY_STOP_SOUND);
registerPacket(Packets.Clientbound.PLAY_LIST_HEADER_AND_FOOTER);
registerPacket(Packets.Clientbound.PLAY_PLAYER_LIST_HEADER_AND_FOOTER);
registerPacket(Packets.Clientbound.PLAY_NBT_QUERY_RESPONSE);
increasePacketCounter(Packets.Clientbound.class);
registerPacket(Packets.Clientbound.PLAY_ENTITY_TELEPORT);

4
src/main/java/de/bixilon/minosoft/protocol/protocol/versions/Protocol_1_15_2.java
View File

@ -73,7 +73,7 @@ public class Protocol_1_15_2 extends Protocol {
registerPacket(Packets.Clientbound.PLAY_CRAFT_RECIPE_RESPONSE);
registerPacket(Packets.Clientbound.PLAY_PLAYER_ABILITIES);
registerPacket(Packets.Clientbound.PLAY_COMBAT_EVENT);
registerPacket(Packets.Clientbound.PLAY_PLAYER_INFO);
registerPacket(Packets.Clientbound.PLAY_PLAYER_LIST_ITEM);
registerPacket(Packets.Clientbound.PLAY_FACE_PLAYER);
registerPacket(Packets.Clientbound.PLAY_PLAYER_POSITION_AND_ROTATION);
registerPacket(Packets.Clientbound.PLAY_UNLOCK_RECIPES);
@ -105,7 +105,7 @@ public class Protocol_1_15_2 extends Protocol {
registerPacket(Packets.Clientbound.PLAY_ENTITY_SOUND_EFFECT);
registerPacket(Packets.Clientbound.PLAY_SOUND_EFFECT);
registerPacket(Packets.Clientbound.PLAY_STOP_SOUND);
registerPacket(Packets.Clientbound.PLAY_LIST_HEADER_AND_FOOTER);
registerPacket(Packets.Clientbound.PLAY_PLAYER_LIST_HEADER_AND_FOOTER);
registerPacket(Packets.Clientbound.PLAY_NBT_QUERY_RESPONSE);
registerPacket(Packets.Clientbound.PLAY_COLLECT_ITEM);
registerPacket(Packets.Clientbound.PLAY_ENTITY_TELEPORT);

4
src/main/java/de/bixilon/minosoft/protocol/protocol/versions/Protocol_1_16_2.java
View File

@ -71,7 +71,7 @@ public class Protocol_1_16_2 extends Protocol {
registerPacket(Packets.Clientbound.PLAY_CRAFT_RECIPE_RESPONSE);
registerPacket(Packets.Clientbound.PLAY_PLAYER_ABILITIES);
registerPacket(Packets.Clientbound.PLAY_COMBAT_EVENT);
registerPacket(Packets.Clientbound.PLAY_PLAYER_INFO);
registerPacket(Packets.Clientbound.PLAY_PLAYER_LIST_ITEM);
registerPacket(Packets.Clientbound.PLAY_FACE_PLAYER);
registerPacket(Packets.Clientbound.PLAY_PLAYER_POSITION_AND_ROTATION);
registerPacket(Packets.Clientbound.PLAY_UNLOCK_RECIPES);
@ -106,7 +106,7 @@ public class Protocol_1_16_2 extends Protocol {
registerPacket(Packets.Clientbound.PLAY_ENTITY_SOUND_EFFECT);
registerPacket(Packets.Clientbound.PLAY_SOUND_EFFECT);
registerPacket(Packets.Clientbound.PLAY_STOP_SOUND);
registerPacket(Packets.Clientbound.PLAY_LIST_HEADER_AND_FOOTER);
registerPacket(Packets.Clientbound.PLAY_PLAYER_LIST_HEADER_AND_FOOTER);
registerPacket(Packets.Clientbound.PLAY_NBT_QUERY_RESPONSE);
registerPacket(Packets.Clientbound.PLAY_COLLECT_ITEM);
registerPacket(Packets.Clientbound.PLAY_ENTITY_TELEPORT);

2
src/main/java/de/bixilon/minosoft/protocol/protocol/versions/Protocol_1_7_10.java
View File

@ -76,7 +76,7 @@ public class Protocol_1_7_10 extends Protocol {
registerPacket(Packets.Clientbound.PLAY_BLOCK_ENTITY_DATA);
registerPacket(Packets.Clientbound.PLAY_OPEN_SIGN_EDITOR);
registerPacket(Packets.Clientbound.PLAY_STATISTICS);
registerPacket(Packets.Clientbound.PLAY_PLAYER_INFO);
registerPacket(Packets.Clientbound.PLAY_PLAYER_LIST_ITEM);
registerPacket(Packets.Clientbound.PLAY_PLAYER_ABILITIES);
registerPacket(Packets.Clientbound.PLAY_TAB_COMPLETE);
registerPacket(Packets.Clientbound.PLAY_SCOREBOARD_OBJECTIVE);

4
src/main/java/de/bixilon/minosoft/protocol/protocol/versions/Protocol_1_8.java
View File

@ -77,7 +77,7 @@ public class Protocol_1_8 extends Protocol {
registerPacket(Packets.Clientbound.PLAY_BLOCK_ENTITY_DATA);
registerPacket(Packets.Clientbound.PLAY_OPEN_SIGN_EDITOR);
registerPacket(Packets.Clientbound.PLAY_STATISTICS);
registerPacket(Packets.Clientbound.PLAY_PLAYER_INFO);
registerPacket(Packets.Clientbound.PLAY_PLAYER_LIST_ITEM);
registerPacket(Packets.Clientbound.PLAY_PLAYER_ABILITIES);
registerPacket(Packets.Clientbound.PLAY_TAB_COMPLETE);
registerPacket(Packets.Clientbound.PLAY_SCOREBOARD_OBJECTIVE);
@ -92,7 +92,7 @@ public class Protocol_1_8 extends Protocol {
registerPacket(Packets.Clientbound.PLAY_WORLD_BORDER);
registerPacket(Packets.Clientbound.PLAY_TITLE);
increasePacketCounter(Packets.Clientbound.class);
registerPacket(Packets.Clientbound.PLAY_LIST_HEADER_AND_FOOTER);
registerPacket(Packets.Clientbound.PLAY_PLAYER_LIST_HEADER_AND_FOOTER);
registerPacket(Packets.Clientbound.PLAY_RESOURCE_PACK_SEND);
registerPacket(Packets.Clientbound.PLAY_NBT_QUERY_RESPONSE);

4
src/main/java/de/bixilon/minosoft/protocol/protocol/versions/Protocol_1_9_4.java
View File

@ -66,7 +66,7 @@ public class Protocol_1_9_4 extends Protocol {
registerPacket(Packets.Clientbound.PLAY_OPEN_SIGN_EDITOR);
registerPacket(Packets.Clientbound.PLAY_PLAYER_ABILITIES);
registerPacket(Packets.Clientbound.PLAY_COMBAT_EVENT);
registerPacket(Packets.Clientbound.PLAY_PLAYER_INFO);
registerPacket(Packets.Clientbound.PLAY_PLAYER_LIST_ITEM);
registerPacket(Packets.Clientbound.PLAY_PLAYER_POSITION_AND_ROTATION);
registerPacket(Packets.Clientbound.PLAY_USE_BED);
registerPacket(Packets.Clientbound.PLAY_DESTROY_ENTITIES);
@ -92,7 +92,7 @@ public class Protocol_1_9_4 extends Protocol {
registerPacket(Packets.Clientbound.PLAY_TIME_UPDATE);
registerPacket(Packets.Clientbound.PLAY_TITLE);
registerPacket(Packets.Clientbound.PLAY_SOUND_EFFECT);
registerPacket(Packets.Clientbound.PLAY_LIST_HEADER_AND_FOOTER);
registerPacket(Packets.Clientbound.PLAY_PLAYER_LIST_HEADER_AND_FOOTER);
registerPacket(Packets.Clientbound.PLAY_COLLECT_ITEM);
registerPacket(Packets.Clientbound.PLAY_ENTITY_TELEPORT);
registerPacket(Packets.Clientbound.PLAY_ENTITY_PROPERTIES);

1
src/main/resources/assets/mapping/versions.json Normal file
View File

File diff suppressed because one or more lines are too long