feat: bazaar...

Took 3 hours 24 minutes

Author: Swofty-Developments

commons/src/main/java/net/swofty/commons/bazaar/BuyOrderRefundTransaction.java

@@ -0,0 +1,42 @@
+package net.swofty.commons.bazaar;
+
+import org.json.JSONObject;
+import java.time.Instant;
+import java.util.UUID;
+
+public record BuyOrderRefundTransaction(
+        UUID orderId,
+        String itemName,
+        UUID owner,
+        UUID ownerProfile,
+        double refundAmount,
+        String reason,  // "COMPLETED", "EXPIRED", "CANCELLED"
+        Instant timestamp
+) implements BazaarTransaction {
+
+    @Override
+    public JSONObject toJSON() {
+        JSONObject json = new JSONObject();
+        json.put("orderId", orderId.toString());
+        json.put("itemName", itemName);
+        json.put("owner", owner.toString());
+        json.put("ownerProfile", ownerProfile.toString());
+        json.put("refundAmount", refundAmount);
+        json.put("reason", reason);
+        json.put("timestamp", timestamp.toString());
+        return json;
+    }
+
+    @Override
+    public BazaarTransaction fromJSON(JSONObject json) {
+        return new BuyOrderRefundTransaction(
+                UUID.fromString(json.getString("orderId")),
+                json.getString("itemName"),
+                UUID.fromString(json.getString("owner")),
+                UUID.fromString(json.getString("ownerProfile")),
+                json.getDouble("refundAmount"),
+                json.getString("reason"),
+                Instant.parse(json.getString("timestamp"))
+        );
+    }
+}

commons/src/main/java/net/swofty/commons/bazaar/SuccessfulBazaarTransaction.java

@@ -7,14 +7,18 @@
 
 // Fired when a buy+sell actually crosses
 public record SuccessfulBazaarTransaction(
-        String   itemName,
-        UUID     buyer,
-        UUID     buyerProfile,
-        UUID     seller,
-        UUID     sellerProfile,
-        double   pricePerUnit,
-        double   quantity,
-        double   taxTaken,        // coins withheld by the system
+        String itemName,
+        UUID buyer,
+        UUID buyerProfile,
+        UUID seller,
+        UUID sellerProfile,
+        double actualPricePerUnit,      // What was actually paid
+        double originalBuyerBid,        // What buyer originally offered
+        double quantity,
+        double taxTaken,
+        double priceImprovement,        // originalBuyerBid - actualPricePerUnit
+        UUID buyerOrderId,              // Track which order this partial fill belongs to
+        UUID sellerOrderId,             // Track seller's order ID too
         Instant timestamp
 ) implements BazaarTransaction {
     @Override
@@ -25,9 +29,13 @@ public JSONObject toJSON() {
         json.put("buyerProfile", buyerProfile.toString());
         json.put("seller", seller.toString());
         json.put("sellerProfile", sellerProfile.toString());
-        json.put("pricePerUnit", pricePerUnit);
+        json.put("actualPricePerUnit", actualPricePerUnit);
+        json.put("originalBuyerBid", originalBuyerBid);
         json.put("quantity", quantity);
         json.put("taxTaken", taxTaken);
+        json.put("priceImprovement", priceImprovement);
+        json.put("buyerOrderId", buyerOrderId.toString());
+        json.put("sellerOrderId", sellerOrderId.toString());
         json.put("timestamp", timestamp.toString());
         return json;
     }
@@ -40,9 +48,13 @@ public BazaarTransaction fromJSON(JSONObject json) {
                 UUID.fromString(json.getString("buyerProfile")),
                 UUID.fromString(json.getString("seller")),
                 UUID.fromString(json.getString("sellerProfile")),
-                json.getDouble("pricePerUnit"),
+                json.getDouble("actualPricePerUnit"),
+                json.getDouble("originalBuyerBid"),
                 json.getDouble("quantity"),
                 json.getDouble("taxTaken"),
+                json.getDouble("priceImprovement"),
+                UUID.fromString(json.getString("buyerOrderId")),
+                UUID.fromString(json.getString("sellerOrderId")),
                 Instant.parse(json.getString("timestamp"))
         );
     }

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

@@ -32,7 +32,7 @@ public BazaarBuyMessage deserialize(String json) {
                 message.itemName = jsonObject.getString("item-name");
                 message.playerUUID = UUID.fromString(jsonObject.getString("player-uuid"));
                 message.profileUUID = UUID.fromString(jsonObject.getString("profile-uuid"));
-                message.price = jsonObject.getInt("price");
+                message.price = jsonObject.getDouble("price");
                 message.amount = jsonObject.getInt("amount");
                 return message;
             }
@@ -74,7 +74,7 @@ public BazaarBuyResponse clone(BazaarBuyResponse value) {
     public static class BazaarBuyMessage {
         public String itemName;
         public int amount;
-        public Integer price;
+        public double price;
         public UUID playerUUID;
         public UUID profileUUID;
     }

proxy.api/src/main/java/net/swofty/proxyapi/redis/ServerOutboundMessage.java

@@ -7,6 +7,7 @@
 import net.swofty.redisapi.api.ChannelRegistry;
 import net.swofty.redisapi.api.RedisAPI;
 import org.json.JSONObject;
+import org.tinylog.Logger;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -59,8 +60,12 @@ public static void registerFromProtocolObject(ProtocolObject object) {
                 message = split[1];
             } else message = "";
 
-            redisMessageListeners.get(uuid).accept(message);
-            redisMessageListeners.remove(uuid);
+            try {
+                redisMessageListeners.get(uuid).accept(message);
+                redisMessageListeners.remove(uuid);
+            } catch (Exception e) {
+                Logger.error("Failed to handle message from " + uuid + ": " + e.getMessage());
+            }
         });
     }