Events FleetCarriers

src/main/java/com/github/ChristopheCVB/EliteDangerous/EliteDangerousAPI.java

@@ -252,6 +252,16 @@ private EliteDangerousAPI() {
  eventDeserializer.registerEventType(RouteEvent.class);
  eventDeserializer.registerEventType(CarrierJumpEvent.class);
  eventDeserializer.registerEventType(CarrierJumpCancelledEvent.class);
+ eventDeserializer.registerEventType(CarrierBuyEvent.class);
+ eventDeserializer.registerEventType(CarrierStatsEvent.class);
+ eventDeserializer.registerEventType(CarrierJumpRequestEvent.class);
+ eventDeserializer.registerEventType(CarrierDecommissionEvent.class);
+ eventDeserializer.registerEventType(CarrierCancelDecommissionEvent.class);
+ eventDeserializer.registerEventType(CarrierShipPackEvent.class);
+ eventDeserializer.registerEventType(CarrierModulePackEvent.class);
+ eventDeserializer.registerEventType(CarrierTradeOrderEvent.class);
+ eventDeserializer.registerEventType(CarrierDockingPermissionEvent.class);
+ eventDeserializer.registerEventType(CarrierNameChangedEvent.class);
 
  DiedEventDeserializer diedEventDeserializer = new DiedEventDeserializer();
  ParentDeserializer parentDeserializer = new ParentDeserializer();

src/main/java/com/github/ChristopheCVB/EliteDangerous/events/fleetcarriers/CarrierBuyEvent.java

@@ -0,0 +1,21 @@
+package com.github.ChristopheCVB.EliteDangerous.events.fleetcarriers;
+
+import com.github.ChristopheCVB.EliteDangerous.events.Event;
+
+public class CarrierBuyEvent extends Event {
+ public Long boughtAtMarket;
+ public Long carrierID;
+ public String location;
+ public Long price;
+ public String variant;
+ public String callsign;
+
+ public interface Listener extends Event.Listener {
+ @Override
+ default <T extends Event> void onTriggered(T event) {
+ this.onCarrierBuyEventTriggered((CarrierBuyEvent) event);
+ }
+
+ void onCarrierBuyEventTriggered(CarrierBuyEvent carrierBuyEvent);
+ }
+}

src/main/java/com/github/ChristopheCVB/EliteDangerous/events/fleetcarriers/CarrierCancelDecommissionEvent.java

@@ -0,0 +1,16 @@
+package com.github.ChristopheCVB.EliteDangerous.events.fleetcarriers;
+
+import com.github.ChristopheCVB.EliteDangerous.events.Event;
+
+public class CarrierCancelDecommissionEvent extends Event {
+ public Long carrierID;
+
+ public interface Listener extends Event.Listener {
+ @Override
+ default <T extends Event> void onTriggered(T event) {
+ this.onCarrierCancelDecommissionEventTriggered((CarrierCancelDecommissionEvent) event);
+ }
+
+ void onCarrierCancelDecommissionEventTriggered(CarrierCancelDecommissionEvent CarrierCancelDecommissionEvent);
+ }
+}

src/main/java/com/github/ChristopheCVB/EliteDangerous/events/fleetcarriers/CarrierDecommissionEvent.java

@@ -0,0 +1,18 @@
+package com.github.ChristopheCVB.EliteDangerous.events.fleetcarriers;
+
+import com.github.ChristopheCVB.EliteDangerous.events.Event;
+
+public class CarrierDecommissionEvent extends Event {
+ public Long carrierID;
+ public Long scrapRefund;
+ public Long scrapTime;
+
+ public interface Listener extends Event.Listener {
+ @Override
+ default <T extends Event> void onTriggered(T event) {
+ this.onCarrierDecommissionEventTriggered((CarrierDecommissionEvent) event);
+ }
+
+ void onCarrierDecommissionEventTriggered(CarrierDecommissionEvent carrierJumpEvent);
+ }
+}

src/main/java/com/github/ChristopheCVB/EliteDangerous/events/fleetcarriers/CarrierDockingPermissionEvent.java

@@ -0,0 +1,18 @@
+package com.github.ChristopheCVB.EliteDangerous.events.fleetcarriers;
+
+import com.github.ChristopheCVB.EliteDangerous.events.Event;
+
+public class CarrierDockingPermissionEvent extends Event {
+ public Long carrierID;
+ public String dockingAccess;
+ public Boolean allowNotorious;
+
+ public interface Listener extends Event.Listener {
+ @Override
+ default <T extends Event> void onTriggered(T event) {
+ this.onCarrierDockingPermissionEventTriggered((CarrierDockingPermissionEvent) event);
+ }
+
+ void onCarrierDockingPermissionEventTriggered(CarrierDockingPermissionEvent carrierDockingPermissionEvent);
+ }
+}

src/main/java/com/github/ChristopheCVB/EliteDangerous/events/fleetcarriers/CarrierJumpRequestEvent.java

@@ -0,0 +1,20 @@
+package com.github.ChristopheCVB.EliteDangerous.events.fleetcarriers;
+
+import com.github.ChristopheCVB.EliteDangerous.events.Event;
+
+public class CarrierJumpRequestEvent extends Event {
+ public Long carrierID;
+ public String systemName;
+ public String body;
+ public Long systemAddress;
+ public Integer bodyID;
+
+ public interface Listener extends Event.Listener {
+ @Override
+ default <T extends Event> void onTriggered(T event) {
+ this.onCarrierJumpRequestEventTriggered((CarrierJumpRequestEvent) event);
+ }
+
+ void onCarrierJumpRequestEventTriggered(CarrierJumpRequestEvent carrierJumpRequestEvent);
+ }
+}

src/main/java/com/github/ChristopheCVB/EliteDangerous/events/fleetcarriers/CarrierModulePackEvent.java

@@ -0,0 +1,14 @@
+package com.github.ChristopheCVB.EliteDangerous.events.fleetcarriers;
+
+import com.github.ChristopheCVB.EliteDangerous.events.Event;
+
+public class CarrierModulePackEvent extends CarrierPackEvent {
+ public interface Listener extends Event.Listener {
+ @Override
+ default <T extends Event> void onTriggered(T event) {
+ this.onCarrierModulePackEventTriggered((CarrierModulePackEvent) event);
+ }
+
+ void onCarrierModulePackEventTriggered(CarrierModulePackEvent carrierModulePackEvent);
+ }
+}

src/main/java/com/github/ChristopheCVB/EliteDangerous/events/fleetcarriers/CarrierNameChangedEvent.java

@@ -0,0 +1,18 @@
+package com.github.ChristopheCVB.EliteDangerous.events.fleetcarriers;
+
+import com.github.ChristopheCVB.EliteDangerous.events.Event;
+
+public class CarrierNameChangedEvent extends Event {
+ public Long carrierID;
+ public String callsign;
+ public String name;
+
+ public interface Listener extends Event.Listener {
+ @Override
+ default <T extends Event> void onTriggered(T event) {
+ this.onCarrierNameChangedEventTriggered((CarrierNameChangedEvent) event);
+ }
+
+ void onCarrierNameChangedEventTriggered(CarrierNameChangedEvent carrierNameChangedEvent);
+ }
+}

src/main/java/com/github/ChristopheCVB/EliteDangerous/events/fleetcarriers/CarrierPackEvent.java

@@ -0,0 +1,11 @@
+package com.github.ChristopheCVB.EliteDangerous.events.fleetcarriers;
+
+import com.github.ChristopheCVB.EliteDangerous.events.Event;
+
+public abstract class CarrierPackEvent extends Event {
+ public Long carrierID;
+ public String operation;
+ public String packTheme;
+ public Integer packTier;
+ public Integer cost;
+}

src/main/java/com/github/ChristopheCVB/EliteDangerous/events/fleetcarriers/CarrierShipPackEvent.java

@@ -0,0 +1,14 @@
+package com.github.ChristopheCVB.EliteDangerous.events.fleetcarriers;
+
+import com.github.ChristopheCVB.EliteDangerous.events.Event;
+
+public class CarrierShipPackEvent extends CarrierPackEvent {
+ public interface Listener extends Event.Listener {
+ @Override
+ default <T extends Event> void onTriggered(T event) {
+ this.onCarrierShipPackEventTriggered((CarrierShipPackEvent) event);
+ }
+
+ void onCarrierShipPackEventTriggered(CarrierShipPackEvent carrierShipPackEvent);
+ }
+}

src/main/java/com/github/ChristopheCVB/EliteDangerous/events/fleetcarriers/CarrierStatsEvent.java

@@ -0,0 +1,32 @@
+package com.github.ChristopheCVB.EliteDangerous.events.fleetcarriers;
+
+import com.github.ChristopheCVB.EliteDangerous.events.Event;
+import com.github.ChristopheCVB.EliteDangerous.models.*;
+
+import java.util.List;
+
+public class CarrierStatsEvent extends Event{
+ public Long carrierID;
+ public String callsign;
+ public String name;
+ public String dockingAccess;
+ public boolean allowNotorious;
+ public Integer fuelLevel;
+ public Float jumpRangeCurr;
+ public Float jumpRangeMax;
+ public Boolean pendingDecommission;
+ public SpaceUsage spaceUsage;
+ public Finance finance;
+ public List<CrewItem> crew;
+ public List<Pack> shipPacks;
+ public List<Pack> modulePacks;
+
+ public interface Listener extends Event.Listener {
+ @Override
+ default <T extends Event> void onTriggered(T event) {
+ this.onCarrierStatsEventTriggered((CarrierStatsEvent) event);
+ }
+
+ void onCarrierStatsEventTriggered(CarrierStatsEvent carrierStatsEvent);
+ }
+}

src/main/java/com/github/ChristopheCVB/EliteDangerous/events/fleetcarriers/CarrierTradeOrderEvent.java

@@ -0,0 +1,22 @@
+package com.github.ChristopheCVB.EliteDangerous.events.fleetcarriers;
+
+import com.github.ChristopheCVB.EliteDangerous.events.Event;
+
+public class CarrierTradeOrderEvent extends Event {
+ public Long carrierID;
+ public Boolean blackMarket;
+ public String commodity;
+ public Integer purchaseOrder;
+ public Integer saleOrder;
+ public Boolean cancelTrade;
+ public Integer price;
+
+ public interface Listener extends Event.Listener {
+ @Override
+ default <T extends Event> void onTriggered(T event) {
+ this.onCarrierTradeOrderEventTriggered((CarrierTradeOrderEvent) event);
+ }
+
+ void onCarrierTradeOrderEventTriggered(CarrierTradeOrderEvent carrierTradeOrderEvent);
+ }
+}

src/main/java/com/github/ChristopheCVB/EliteDangerous/events/fleetcarriers/NotImplementedEvent.java

@@ -1,14 +1,5 @@
 package com.github.ChristopheCVB.EliteDangerous.events.fleetcarriers;
 
 public abstract class NotImplementedEvent {
- // TODO: CarrierBuy Event https://elite-journal.readthedocs.io/en/latest/Fleet%20Carriers/#carrierbuy
- // TODO: CarrierStats Event https://elite-journal.readthedocs.io/en/latest/Fleet%20Carriers/#carrierstats
- // TODO: CarrierJumpRequest Event https://elite-journal.readthedocs.io/en/latest/Fleet%20Carriers/#carrierjumprequest
- // TODO: CarrierDecommission Event https://elite-journal.readthedocs.io/en/latest/Fleet%20Carriers/#carrierdecommission
- // TODO: CarrierCancelDecommission Event https://elite-journal.readthedocs.io/en/latest/Fleet%20Carriers/#carriercanceldecommission
- // TODO: CarrierShipPack Event https://elite-journal.readthedocs.io/en/latest/Fleet%20Carriers/#carriershippack
- // TODO: CarrierModulePack Event https://elite-journal.readthedocs.io/en/latest/Fleet%20Carriers/#carriermodulepack
- // TODO: CarrierTradeOrder Event https://elite-journal.readthedocs.io/en/latest/Fleet%20Carriers/#carriertradeorder
- // TODO: CarrierDockingPermission Event https://elite-journal.readthedocs.io/en/latest/Fleet%20Carriers/#carrierdockingpermission
- // TODO: CarrierNameChanged Event https://elite-journal.readthedocs.io/en/latest/Fleet%20Carriers/#carriernamechanged
+
 }

src/main/java/com/github/ChristopheCVB/EliteDangerous/models/CrewItem.java

@@ -0,0 +1,8 @@
+package com.github.ChristopheCVB.EliteDangerous.models;
+
+public class CrewItem {
+ public String crewRole;
+ public Boolean activated;
+ public Boolean enabled;
+ public String crewName;
+}

src/main/java/com/github/ChristopheCVB/EliteDangerous/models/Finance.java

@@ -0,0 +1,9 @@
+package com.github.ChristopheCVB.EliteDangerous.models;
+
+public class Finance {
+ public Integer carrierBalance;
+ public Integer reserveBalance;
+ public Integer availableBalance;
+ public Integer reservePercent;
+ public Integer taxRate;
+}

src/main/java/com/github/ChristopheCVB/EliteDangerous/models/Pack.java

@@ -0,0 +1,6 @@
+package com.github.ChristopheCVB.EliteDangerous.models;
+
+public class Pack {
+ public String packTheme;
+ public Integer packTier;
+}

src/main/java/com/github/ChristopheCVB/EliteDangerous/models/SpaceUsage.java

@@ -0,0 +1,11 @@
+package com.github.ChristopheCVB.EliteDangerous.models;
+
+public class SpaceUsage {
+ public Integer totalCapacity;
+ public Integer crew;
+ public Integer cargo;
+ public Integer cargoSpaceReserved;
+ public Integer shipPacks;
+ public Integer modulePacks;
+ public Integer freeSpace;
+}