Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2025-02-18 04:31:44 +01:00
Code Issues Projects Releases Wiki Activity

Simplify code

Browse Source
This commit is contained in:
FlorianMichael 2024-04-07 20:08:16 +02:00
parent 8961660846
commit 935077222e
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java
View File

@ -26,7 +26,6 @@ import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.protocol.packet.State; import com.viaversion.viaversion.api.protocol.packet.State;
import com.viaversion.viaversion.api.protocol.packet.provider.PacketTypesProvider; import com.viaversion.viaversion.api.protocol.packet.provider.PacketTypesProvider;
import com.viaversion.viaversion.api.protocol.packet.provider.SimplePacketTypesProvider; import com.viaversion.viaversion.api.protocol.packet.provider.SimplePacketTypesProvider;
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.misc.ParticleType; import com.viaversion.viaversion.api.type.types.misc.ParticleType;
import com.viaversion.viaversion.api.type.types.version.Types1_20_5; import com.viaversion.viaversion.api.type.types.version.Types1_20_5;
@ -120,9 +119,10 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol<ClientboundPa
wrapper.passthrough(Type.SIGNATURE_BYTES); // Signature wrapper.passthrough(Type.SIGNATURE_BYTES); // Signature
} }
// Remove original acknowledgement
wrapper.read(Type.VAR_INT); // Offset wrapper.read(Type.VAR_INT); // Offset
wrapper.read(Type.ACKNOWLEDGED_BIT_SET); // Acknowledged wrapper.read(Type.ACKNOWLEDGED_BIT_SET); // Acknowledged
getChatAckHandler().handle(wrapper); writeChatAck(wrapper);
}); });
registerServerbound(ServerboundPackets1_20_5.CHAT_COMMAND, wrapper -> { registerServerbound(ServerboundPackets1_20_5.CHAT_COMMAND, wrapper -> {
wrapper.passthrough(Type.STRING); // Command wrapper.passthrough(Type.STRING); // Command
@ -130,7 +130,7 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol<ClientboundPa
wrapper.write(Type.LONG, System.currentTimeMillis()); // Timestamp wrapper.write(Type.LONG, System.currentTimeMillis()); // Timestamp
wrapper.write(Type.LONG, 0L); // Salt wrapper.write(Type.LONG, 0L); // Salt
wrapper.write(Type.VAR_INT, 0); // No signatures wrapper.write(Type.VAR_INT, 0); // No signatures
getChatAckHandler().handle(wrapper); writeChatAck(wrapper);
}); });
cancelServerbound(ServerboundPackets1_20_5.CHAT_ACK); cancelServerbound(ServerboundPackets1_20_5.CHAT_ACK);
@ -145,13 +145,11 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol<ClientboundPa
cancelServerbound(ServerboundPackets1_20_5.DEBUG_SAMPLE_SUBSCRIPTION); cancelServerbound(ServerboundPackets1_20_5.DEBUG_SAMPLE_SUBSCRIPTION);
} }
private PacketHandler getChatAckHandler() { private void writeChatAck(final PacketWrapper wrapper) {
return wrapper -> {
final AcknowledgedMessagesStorage storage = wrapper.user().get(AcknowledgedMessagesStorage.class); final AcknowledgedMessagesStorage storage = wrapper.user().get(AcknowledgedMessagesStorage.class);
wrapper.write(Type.VAR_INT, storage.offset()); wrapper.write(Type.VAR_INT, storage.offset());
wrapper.write(Type.ACKNOWLEDGED_BIT_SET, storage.toAck()); wrapper.write(Type.ACKNOWLEDGED_BIT_SET, storage.toAck());
storage.clearOffset(); storage.clearOffset();
};
} }
@Override @Override