Skip to content

Commit 01c07e7

Browse files
Swoftyclaude
andcommitted
refactor: standardize success/error fields on all protocol Response types
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 77e6533 commit 01c07e7

File tree

111 files changed

+301
-207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+301
-207
lines changed

commons/src/main/java/net/swofty/commons/protocol/objects/api/APIAuthenticateCodeProtocolObject.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import net.swofty.commons.protocol.JacksonSerializer;
44
import net.swofty.commons.protocol.ProtocolObject;
55
import net.swofty.commons.protocol.Serializer;
6+
import org.jetbrains.annotations.Nullable;
67

78
import java.util.UUID;
89

@@ -21,5 +22,5 @@ public Serializer<AuthenticateCodeResponse> getReturnSerializer() {
2122

2223
public record AuthenticateCodeMessage(String authCode, String playerName, UUID playerUUID) {}
2324

24-
public record AuthenticateCodeResponse(boolean successful) {}
25+
public record AuthenticateCodeResponse(boolean success, @Nullable String error) {}
2526
}

commons/src/main/java/net/swofty/commons/protocol/objects/auctions/AuctionAddItemProtocolObject.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import net.swofty.commons.protocol.Serializer;
88

99
import java.util.UUID;
10+
import org.jetbrains.annotations.Nullable;
1011

1112
public class AuctionAddItemProtocolObject extends ProtocolObject
1213
<AuctionAddItemProtocolObject.AuctionAddItemMessage,
@@ -24,5 +25,5 @@ public Serializer<AuctionAddItemResponse> getReturnSerializer() {
2425

2526
public record AuctionAddItemMessage(AuctionItem item, AuctionCategories category) {}
2627

27-
public record AuctionAddItemResponse(UUID uuid) {}
28+
public record AuctionAddItemResponse(UUID uuid, boolean success, @Nullable String error) {}
2829
}

commons/src/main/java/net/swofty/commons/protocol/objects/auctions/AuctionFetchItemProtocolObject.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import net.swofty.commons.protocol.Serializer;
77

88
import java.util.UUID;
9+
import org.jetbrains.annotations.Nullable;
910

1011
public class AuctionFetchItemProtocolObject extends ProtocolObject<
1112
AuctionFetchItemProtocolObject.AuctionFetchItemMessage,
@@ -23,5 +24,5 @@ public Serializer<AuctionFetchItemResponse> getReturnSerializer() {
2324

2425
public record AuctionFetchItemMessage(UUID uuid) {}
2526

26-
public record AuctionFetchItemResponse(AuctionItem item) {}
27+
public record AuctionFetchItemResponse(AuctionItem item, boolean success, @Nullable String error) {}
2728
}

commons/src/main/java/net/swofty/commons/protocol/objects/auctions/AuctionFetchItemsProtocolObject.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import net.swofty.commons.skyblock.auctions.AuctionItem;
1010

1111
import java.util.List;
12+
import org.jetbrains.annotations.Nullable;
1213

1314
public class AuctionFetchItemsProtocolObject extends ProtocolObject<
1415
AuctionFetchItemsProtocolObject.AuctionFetchItemsMessage,
@@ -31,6 +32,8 @@ public record AuctionFetchItemsMessage(
3132
) {}
3233

3334
public record AuctionFetchItemsResponse(
34-
List<AuctionItem> items
35+
List<AuctionItem> items,
36+
boolean success,
37+
@Nullable String error
3538
) {}
3639
}

commons/src/main/java/net/swofty/commons/protocol/objects/bazaar/BazaarBuyProtocolObject.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import net.swofty.commons.protocol.JacksonSerializer;
44
import net.swofty.commons.protocol.ProtocolObject;
55
import net.swofty.commons.protocol.Serializer;
6+
import org.jetbrains.annotations.Nullable;
67

78
import java.util.UUID;
89

@@ -21,5 +22,5 @@ public Serializer<BazaarBuyResponse> getReturnSerializer() {
2122

2223
public record BazaarBuyMessage(String itemName, int amount, double price, UUID playerUUID, UUID profileUUID) {}
2324

24-
public record BazaarBuyResponse(boolean successful) {}
25+
public record BazaarBuyResponse(boolean success, @Nullable String error) {}
2526
}

commons/src/main/java/net/swofty/commons/protocol/objects/bazaar/BazaarCancelProtocolObject.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import net.swofty.commons.protocol.JacksonSerializer;
44
import net.swofty.commons.protocol.ProtocolObject;
55
import net.swofty.commons.protocol.Serializer;
6+
import org.jetbrains.annotations.Nullable;
67

78
import java.util.UUID;
89

@@ -22,5 +23,5 @@ public Serializer<CancelResponse> getReturnSerializer() {
2223

2324
public record CancelMessage(UUID orderId, UUID playerUuid, UUID profileUuid) {}
2425

25-
public record CancelResponse(boolean successful) {}
26+
public record CancelResponse(boolean success, @Nullable String error) {}
2627
}

commons/src/main/java/net/swofty/commons/protocol/objects/bazaar/BazaarGetItemProtocolObject.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import java.util.List;
88
import java.util.UUID;
9+
import org.jetbrains.annotations.Nullable;
910

1011
public class BazaarGetItemProtocolObject extends ProtocolObject<
1112
BazaarGetItemProtocolObject.BazaarGetItemMessage,
@@ -26,7 +27,9 @@ public record BazaarGetItemMessage(String itemName) {}
2627
public record BazaarGetItemResponse(
2728
String itemName,
2829
List<OrderRecord> buyOrders,
29-
List<OrderRecord> sellOrders
30+
List<OrderRecord> sellOrders,
31+
boolean success,
32+
@Nullable String error
3033
) {}
3134

3235
public record OrderRecord(

commons/src/main/java/net/swofty/commons/protocol/objects/bazaar/BazaarGetPendingOrdersProtocolObject.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import java.util.List;
88
import java.util.UUID;
9+
import org.jetbrains.annotations.Nullable;
910

1011
public class BazaarGetPendingOrdersProtocolObject
1112
extends ProtocolObject<
@@ -33,5 +34,5 @@ public record PendingOrder(
3334
UUID profileUUID
3435
) {}
3536

36-
public record BazaarGetPendingOrdersResponse(List<PendingOrder> orders) {}
37+
public record BazaarGetPendingOrdersResponse(List<PendingOrder> orders, boolean success, @Nullable String error) {}
3738
}

commons/src/main/java/net/swofty/commons/protocol/objects/bazaar/BazaarGetPendingTransactionsProtocolObject.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.util.List;
99
import java.util.Map;
1010
import java.util.UUID;
11+
import org.jetbrains.annotations.Nullable;
1112

1213
public class BazaarGetPendingTransactionsProtocolObject extends ProtocolObject<
1314
BazaarGetPendingTransactionsProtocolObject.BazaarGetPendingTransactionsMessage,
@@ -25,7 +26,7 @@ public Serializer<BazaarGetPendingTransactionsResponse> getReturnSerializer() {
2526

2627
public record BazaarGetPendingTransactionsMessage(UUID playerUUID, UUID profileUUID) {}
2728

28-
public record BazaarGetPendingTransactionsResponse(List<PendingTransactionInfo> transactions) {}
29+
public record BazaarGetPendingTransactionsResponse(List<PendingTransactionInfo> transactions, boolean success, @Nullable String error) {}
2930

3031
public record PendingTransactionInfo(
3132
String id,

commons/src/main/java/net/swofty/commons/protocol/objects/bazaar/BazaarProcessPendingTransactionsProtocolObject.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import java.util.List;
88
import java.util.UUID;
9+
import org.jetbrains.annotations.Nullable;
910

1011
public class BazaarProcessPendingTransactionsProtocolObject extends ProtocolObject<
1112
BazaarProcessPendingTransactionsProtocolObject.BazaarProcessPendingTransactionsMessage,
@@ -23,5 +24,5 @@ public Serializer<BazaarProcessPendingTransactionsResponse> getReturnSerializer(
2324

2425
public record BazaarProcessPendingTransactionsMessage(UUID playerUUID, UUID profileUUID, List<String> transactionIds) {}
2526

26-
public record BazaarProcessPendingTransactionsResponse(int processedCount, int failedCount, List<String> successfulTransactionIds, List<String> failedTransactionIds) {}
27+
public record BazaarProcessPendingTransactionsResponse(int processedCount, int failedCount, List<String> successfulTransactionIds, List<String> failedTransactionIds, boolean success, @Nullable String error) {}
2728
}

0 commit comments

Comments
 (0)