replace switch case with enchanted switch case (EntityMetaData)

This commit is contained in:
Bixilon 2020-08-28 15:55:36 +02:00
parent 429b32a2da
commit 7e4db08043
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4

View File

@ -53,81 +53,44 @@ public class EntityMetaData {
Object data = null; Object data = null;
switch (type) { switch (type) {
case BYTE: case BYTE -> data = buffer.readByte();
data = buffer.readByte(); case VAR_INT -> data = buffer.readVarInt();
break; case SHORT -> data = buffer.readShort();
case VAR_INT: case INT -> data = buffer.readInt();
data = buffer.readVarInt(); case FLOAT -> data = buffer.readFloat();
break; case STRING -> data = buffer.readString();
case SHORT: case CHAT -> data = buffer.readTextComponent();
data = buffer.readShort(); case BOOLEAN -> data = buffer.readBoolean();
break; case VECTOR -> data = new Vector(buffer.readInt(), buffer.readInt(), buffer.readInt());
case INT: case SLOT -> data = buffer.readSlot();
data = buffer.readInt(); case ROTATION -> data = new EntityRotation(buffer.readFloat(), buffer.readFloat(), buffer.readFloat());
break; case POSITION -> data = buffer.readPosition();
case FLOAT: case OPT_CHAT -> {
data = buffer.readFloat();
break;
case STRING:
data = buffer.readString();
break;
case CHAT:
data = buffer.readTextComponent();
break;
case BOOLEAN:
data = buffer.readBoolean();
break;
case VECTOR:
data = new Vector(buffer.readInt(), buffer.readInt(), buffer.readInt());
break;
case SLOT:
data = buffer.readSlot();
break;
case ROTATION:
data = new EntityRotation(buffer.readFloat(), buffer.readFloat(), buffer.readFloat());
break;
case POSITION:
data = buffer.readPosition();
break;
case OPT_CHAT:
if (buffer.readBoolean()) { if (buffer.readBoolean()) {
data = buffer.readTextComponent(); data = buffer.readTextComponent();
} }
break; }
case OPT_POSITION: case OPT_POSITION -> {
if (buffer.readBoolean()) { if (buffer.readBoolean()) {
data = buffer.readPosition(); data = buffer.readPosition();
} }
break; }
case DIRECTION: case DIRECTION -> data = buffer.readDirection();
data = buffer.readDirection(); case OPT_UUID -> {
break;
case OPT_UUID:
if (buffer.readBoolean()) { if (buffer.readBoolean()) {
data = buffer.readUUID(); data = buffer.readUUID();
} }
break; }
case NBT: case NBT -> data = buffer.readNBT();
data = buffer.readNBT(); case PARTICLE -> data = buffer.readParticle();
break; case POSE -> data = buffer.readPose();
case PARTICLE: case BLOCK_ID -> {
data = buffer.readParticle();
break;
case POSE:
data = buffer.readPose();
break;
case BLOCK_ID:
int blockId = buffer.readVarInt(); int blockId = buffer.readVarInt();
data = buffer.getConnection().getMapping().getBlockById(blockId); data = buffer.getConnection().getMapping().getBlockById(blockId);
break; }
case OPT_VAR_INT: case OPT_VAR_INT -> data = buffer.readVarInt() - 1;
data = buffer.readVarInt() - 1; case VILLAGER_DATA -> data = new VillagerData(VillagerData.VillagerTypes.byId(buffer.readVarInt()), VillagerData.VillagerProfessions.byId(buffer.readVarInt(), buffer.getProtocolId()), VillagerData.VillagerLevels.byId(buffer.readVarInt()));
break; default -> throw new IllegalStateException("Unexpected value: " + type);
case VILLAGER_DATA:
data = new VillagerData(VillagerData.VillagerTypes.byId(buffer.readVarInt()), VillagerData.VillagerProfessions.byId(buffer.readVarInt(), buffer.getProtocolId()), VillagerData.VillagerLevels.byId(buffer.readVarInt()));
break;
default:
throw new IllegalStateException("Unexpected value: " + type);
} }
return data; return data;
} }