From f6a5c1b2112e3494d2f277f2f23656ce3248f97c Mon Sep 17 00:00:00 2001 From: Ziggy Date: Tue, 11 Apr 2023 19:10:12 +0200 Subject: [PATCH] Converted GetAuctionDetails from Java to Kotlin --- .../common/network/packets/PacketType.java | 2 +- ...ctionDetails.java => GetAuctionDetails.kt} | 59 +++++++------------ 2 files changed, 22 insertions(+), 39 deletions(-) rename src/main/java/com/projectswg/common/network/packets/swg/zone/auction/{GetAuctionDetails.java => GetAuctionDetails.kt} (70%) diff --git a/src/main/java/com/projectswg/common/network/packets/PacketType.java b/src/main/java/com/projectswg/common/network/packets/PacketType.java index 6a4b0f0..4601818 100644 --- a/src/main/java/com/projectswg/common/network/packets/PacketType.java +++ b/src/main/java/com/projectswg/common/network/packets/PacketType.java @@ -313,7 +313,7 @@ public enum PacketType { // Auction IS_VENDOR_OWNER_RESPONSE_MESSAGE (IsVendorOwnerResponseMessage.CRC, IsVendorOwnerResponseMessage.class), AUCTION_QUERY_HEADERS_MESSAGE (AuctionQueryHeadersMessage.Companion.getCrc(), AuctionQueryHeadersMessage.class), - GET_AUCTION_DETAILS (GetAuctionDetails.CRC, GetAuctionDetails.class), + GET_AUCTION_DETAILS (GetAuctionDetails.Companion.getCrc(), GetAuctionDetails.class), GET_AUCTION_DETAILS_RESPONSE (GetAuctionDetailsResponse.CRC, GetAuctionDetailsResponse.class), CANCEL_LIVE_AUCTION_MESSAGE (CancelLiveAuctionMessage.Companion.getCrc(), CancelLiveAuctionMessage.class), CANCEL_LIVE_AUCTION_RESPONSE_MESSAGE (CancelLiveAuctionResponseMessage.Companion.getCrc(), CancelLiveAuctionResponseMessage.class), diff --git a/src/main/java/com/projectswg/common/network/packets/swg/zone/auction/GetAuctionDetails.java b/src/main/java/com/projectswg/common/network/packets/swg/zone/auction/GetAuctionDetails.kt similarity index 70% rename from src/main/java/com/projectswg/common/network/packets/swg/zone/auction/GetAuctionDetails.java rename to src/main/java/com/projectswg/common/network/packets/swg/zone/auction/GetAuctionDetails.kt index 8f3004a..6095c05 100644 --- a/src/main/java/com/projectswg/common/network/packets/swg/zone/auction/GetAuctionDetails.java +++ b/src/main/java/com/projectswg/common/network/packets/swg/zone/auction/GetAuctionDetails.kt @@ -24,48 +24,31 @@ * You should have received a copy of the GNU Affero General Public License * * along with PSWGCommon. If not, see . * ***********************************************************************************/ -package com.projectswg.common.network.packets.swg.zone.auction; +package com.projectswg.common.network.packets.swg.zone.auction -import com.projectswg.common.network.NetBuffer; -import com.projectswg.common.network.packets.SWGPacket; +import com.projectswg.common.network.NetBuffer +import com.projectswg.common.network.packets.SWGPacket -public class GetAuctionDetails extends SWGPacket { - - public static final int CRC = com.projectswg.common.data.CRC.getCrc("GetAuctionDetails"); - - private long objectId; - - public GetAuctionDetails() { - this(0); - } - - public GetAuctionDetails(long objectId) { - this.objectId = objectId; - } - - public GetAuctionDetails(NetBuffer data) { - decode(data); - } - - public void decode(NetBuffer data) { - if (!super.checkDecode(data, CRC)) - return; - objectId = data.getLong(); - } - - public NetBuffer encode() { - NetBuffer data = NetBuffer.allocate(14); - data.addShort(2); - data.addInt(CRC); - data.addLong(objectId); - return data; +data class GetAuctionDetails( + var objectId: Long = 0L, +) : SWGPacket() { + + companion object { + val crc = getCrc("GetAuctionDetails") } - public long getObjectId() { - return objectId; + override fun decode(data: NetBuffer) { + if (!super.checkDecode(data, crc)) return + objectId = data.long } - public void setObjectId(long objectId) { - this.objectId = objectId; + override fun encode(): NetBuffer { + val data = NetBuffer.allocate(14) + + data.addShort(2) + data.addInt(crc) + data.addLong(objectId) + + return data } -} +} \ No newline at end of file