From 10f257297d71dee7798e482b051cddbf8a64477d Mon Sep 17 00:00:00 2001 From: RoyceDa Date: Wed, 4 Feb 2026 06:00:05 +0200 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D1=82=D0=B8=D0=BF=D0=B8=D0=B7=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/io/orprotocol/packet/Packet.java | 14 +++++++------- .../java/io/orprotocol/packet/PacketExecutor.java | 4 ++-- .../java/io/orprotocol/packet/PacketManager.java | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/io/orprotocol/packet/Packet.java b/src/main/java/io/orprotocol/packet/Packet.java index f27431b..03b5378 100644 --- a/src/main/java/io/orprotocol/packet/Packet.java +++ b/src/main/java/io/orprotocol/packet/Packet.java @@ -10,6 +10,13 @@ public abstract class Packet { public int packetId; public PacketManager packetManager; + /** + * Читает данные пакета из потока. Используется при получении + * + * @param stream Поток с данными пакета. + */ + public abstract void read(Stream stream); + /** * Записывает данные пакета в поток. Исползуется при отправке * @@ -17,11 +24,4 @@ public abstract class Packet { */ public abstract Stream write(); - /** - * Читает данные пакета из потока. Используется при получении - * - * @param stream Поток с данными пакета. - */ - public abstract void read(Stream stream); - } diff --git a/src/main/java/io/orprotocol/packet/PacketExecutor.java b/src/main/java/io/orprotocol/packet/PacketExecutor.java index cb75c69..d6aa7e6 100644 --- a/src/main/java/io/orprotocol/packet/PacketExecutor.java +++ b/src/main/java/io/orprotocol/packet/PacketExecutor.java @@ -7,7 +7,7 @@ import io.orprotocol.client.Client; /** * Базовый класс для обработчиков пакетов. */ -public abstract class PacketExecutor { +public abstract class PacketExecutor { public Settings settings; /** @@ -22,5 +22,5 @@ public abstract class PacketExecutor { * @param packet Пакет, полученный от клиента. * @param client Клиент, отправивший пакет. */ - public abstract void onPacketReceived(Packet packet, Client client) throws Exception, ProtocolException; + public abstract void onPacketReceived(T packet, Client client) throws Exception, ProtocolException; } diff --git a/src/main/java/io/orprotocol/packet/PacketManager.java b/src/main/java/io/orprotocol/packet/PacketManager.java index d2bf5cf..3e11a29 100644 --- a/src/main/java/io/orprotocol/packet/PacketManager.java +++ b/src/main/java/io/orprotocol/packet/PacketManager.java @@ -8,7 +8,7 @@ import java.util.HashMap; public class PacketManager { private HashMap> packets; - private HashMap executors; + private HashMap> executors; public PacketManager() { this.packets = new HashMap<>(); @@ -46,7 +46,7 @@ public class PacketManager { * Возвращает зарегистрированные исполнители пакетов. * @return Хэш-карта зарегистрированных исполнителей пакетов. */ - public HashMap getExecutors() { + public HashMap> getExecutors() { return this.executors; } @@ -73,7 +73,7 @@ public class PacketManager { * @param packetId ID пакета * @param executor Обработчик пакета */ - public void registerExecutor(int packetId, PacketExecutor executor) { + public void registerExecutor(int packetId, PacketExecutor executor) { if (this.executors == null) { this.executors = new HashMap<>(); }