Feat/oddysey events

src/main/java/com/christophecvb/elitedangerous/EliteDangerousAPI.java

@@ -3,19 +3,21 @@
 import com.christophecvb.elitedangerous.events.Event;
 import com.christophecvb.elitedangerous.events.StatusEvent;
 import com.christophecvb.elitedangerous.events.backpack.BackpackEvent;
+import com.christophecvb.elitedangerous.events.backpack.TransferMicroResourcesEvent;
+import com.christophecvb.elitedangerous.events.backpack.UseConsumableEvent;
 import com.christophecvb.elitedangerous.events.book.BookDropshipEvent;
 import com.christophecvb.elitedangerous.events.book.BookTaxiEvent;
-import com.christophecvb.elitedangerous.events.buysell.BuyMicroResourcesEvent;
-import com.christophecvb.elitedangerous.events.buysell.BuySuitEvent;
-import com.christophecvb.elitedangerous.events.buysell.BuyWeaponEvent;
+import com.christophecvb.elitedangerous.events.buysell.*;
 import com.christophecvb.elitedangerous.events.combat.*;
 import com.christophecvb.elitedangerous.events.exploration.*;
 import com.christophecvb.elitedangerous.events.fleetcarriers.*;
+import com.christophecvb.elitedangerous.events.loadout.*;
 import com.christophecvb.elitedangerous.events.other.*;
 import com.christophecvb.elitedangerous.events.powerplay.*;
 import com.christophecvb.elitedangerous.events.squadron.*;
 import com.christophecvb.elitedangerous.events.startup.*;
 import com.christophecvb.elitedangerous.events.stationservices.*;
+import com.christophecvb.elitedangerous.events.other.UpgradeSuitEvent;
 import com.christophecvb.elitedangerous.events.trade.*;
 import com.christophecvb.elitedangerous.events.travel.*;
 import com.christophecvb.elitedangerous.models.scan.Parent;
@@ -257,6 +259,24 @@ public class EliteDangerousAPI {
  eventDeserializer.registerEventType(BuyMicroResourcesEvent.class);
  eventDeserializer.registerEventType(BuySuitEvent.class);
  eventDeserializer.registerEventType(BuyWeaponEvent.class);
+ eventDeserializer.registerEventType(UseConsumableEvent.class);
+ eventDeserializer.registerEventType(UpgradeWeaponEvent.class);
+ eventDeserializer.registerEventType(UpgradeSuitEvent.class);
+ eventDeserializer.registerEventType(TradeMicroResourcesEvent.class);
+ eventDeserializer.registerEventType(SellSuitEvent.class);
+ eventDeserializer.registerEventType(SellWeaponEvent.class);
+ eventDeserializer.registerEventType(CreateSuitLoadoutEvent.class);
+ eventDeserializer.registerEventType(DeleteSuitLoadoutEvent.class);
+ eventDeserializer.registerEventType(EmbarkEvent.class);
+ eventDeserializer.registerEventType(LoadoutEquipModuleEvent.class);
+ eventDeserializer.registerEventType(LoadoutRemoveModuleEvent.class);
+ eventDeserializer.registerEventType(RenameSuitLoadoutEvent.class);
+ eventDeserializer.registerEventType(ScanOrganicEvent.class);
+ eventDeserializer.registerEventType(SellMicroResourcesEvent.class);
+ eventDeserializer.registerEventType(SellOrganicDataEvent.class);
+ eventDeserializer.registerEventType(ShipLockerMaterialsEvent.class);
+ eventDeserializer.registerEventType(SwitchSuitLoadoutEvent.class);
+ eventDeserializer.registerEventType(TransferMicroResourcesEvent.class);
 
  DiedEventDeserializer diedEventDeserializer = new DiedEventDeserializer();
  ParentDeserializer parentDeserializer = new ParentDeserializer();

src/main/java/com/christophecvb/elitedangerous/events/backpack/TransferMicroResourcesEvent.java

@@ -0,0 +1,14 @@
+package com.christophecvb.elitedangerous.events.backpack;
+
+import com.christophecvb.elitedangerous.events.Event;
+import com.christophecvb.elitedangerous.models.MicroResource;
+
+import java.util.ArrayList;
+
+public class TransferMicroResourcesEvent extends Event {
+ public ArrayList<transfer> transfers;
+
+ public static class transfer extends MicroResource {
+ public String direction;
+ }
+}

src/main/java/com/christophecvb/elitedangerous/events/backpack/UseConsumableEvent.java

@@ -0,0 +1,9 @@
+package com.christophecvb.elitedangerous.events.backpack;
+
+import com.christophecvb.elitedangerous.events.Event;
+
+public class UseConsumableEvent extends Event {
+ public String name;
+ public String nameLocalised;
+ public String type;
+}

src/main/java/com/christophecvb/elitedangerous/events/buysell/BuyMicroResourcesEvent.java

@@ -1,22 +1,13 @@
 package com.christophecvb.elitedangerous.events.buysell;
 
 import com.christophecvb.elitedangerous.events.Event;
+import com.christophecvb.elitedangerous.models.MicroResource;
 
 public class BuyMicroResourcesEvent extends Event {
  public String name;
  public String nameLocalised;
- public Category category;
+ public MicroResource.Category category;
  public Integer count;
  public Long price;
  public Long marketID;
-
- public enum Category {
- Encoded,
- Raw,
- Manufactured,
- Item,
- Component,
- Data,
- Consumable,
- }
 }

src/main/java/com/christophecvb/elitedangerous/events/buysell/SellMicroResourcesEvent.java

@@ -0,0 +1,12 @@
+package com.christophecvb.elitedangerous.events.buysell;
+
+import com.christophecvb.elitedangerous.events.Event;
+import com.christophecvb.elitedangerous.models.MicroResource;
+
+import java.util.ArrayList;
+
+public class SellMicroResourcesEvent extends Event {
+ public ArrayList<MicroResource> microResources;
+ public Long price;
+ public Long marketID;
+}

src/main/java/com/christophecvb/elitedangerous/events/buysell/SellOrganicDataEvent.java

@@ -0,0 +1,16 @@
+package com.christophecvb.elitedangerous.events.buysell;
+
+import com.christophecvb.elitedangerous.events.Event;
+import com.christophecvb.elitedangerous.models.OrganicData;
+
+import java.util.ArrayList;
+
+public class SellOrganicDataEvent extends Event {
+ public Integer marketID;
+ public ArrayList<BioData> bioData;
+
+ public static class BioData extends OrganicData {
+ public Long value;
+ public Long bonus;
+ }
+}

src/main/java/com/christophecvb/elitedangerous/events/buysell/SellSuitEvent.java

@@ -0,0 +1,9 @@
+package com.christophecvb.elitedangerous.events.buysell;
+
+import com.christophecvb.elitedangerous.events.Event;
+
+public class SellSuitEvent extends Event {
+ public String name;
+ public String nameLocalised;
+ public Long price;
+}

src/main/java/com/christophecvb/elitedangerous/events/buysell/SellWeaponEvent.java

@@ -0,0 +1,9 @@
+package com.christophecvb.elitedangerous.events.buysell;
+
+import com.christophecvb.elitedangerous.events.Event;
+
+public class SellWeaponEvent extends Event {
+ public String name;
+ public Long price;
+ public Long suitModuleID;
+}

src/main/java/com/christophecvb/elitedangerous/events/exploration/ScanOrganicEvent.java

@@ -0,0 +1,17 @@
+package com.christophecvb.elitedangerous.events.exploration;
+
+import com.christophecvb.elitedangerous.events.Event;
+
+public class ScanOrganicEvent extends Event {
+ public ScanType scanType;
+ public String genus;
+ public String species;
+ public Long systemAddress;
+ public Long body;
+
+ public enum ScanType {
+ Log,
+ Sample,
+ Analyse
+ }
+}

src/main/java/com/christophecvb/elitedangerous/events/loadout/CreateSuitLoadoutEvent.java

@@ -0,0 +1,7 @@
+package com.christophecvb.elitedangerous.events.loadout;
+
+import java.util.ArrayList;
+
+public class CreateSuitLoadoutEvent extends LoadoutBaseEvent {
+ public ArrayList<SwitchSuitLoadoutEvent.Module> modules;
+}

src/main/java/com/christophecvb/elitedangerous/events/loadout/DeleteSuitLoadoutEvent.java

@@ -0,0 +1,4 @@
+package com.christophecvb.elitedangerous.events.loadout;
+
+public class DeleteSuitLoadoutEvent extends LoadoutBaseEvent{
+}

src/main/java/com/christophecvb/elitedangerous/events/loadout/LoadoutBaseEvent.java

@@ -0,0 +1,10 @@
+package com.christophecvb.elitedangerous.events.loadout;
+
+import com.christophecvb.elitedangerous.events.Event;
+
+public abstract class LoadoutBaseEvent extends Event {
+ public Long suitID;
+ public String suitName;
+ public Long loadoutID;
+ public String loadoutName;
+}

src/main/java/com/christophecvb/elitedangerous/events/loadout/LoadoutEquipModuleEvent.java

@@ -0,0 +1,7 @@
+package com.christophecvb.elitedangerous.events.loadout;
+
+public class LoadoutEquipModuleEvent extends LoadoutBaseEvent {
+ public String slotName;
+ public String moduleName;
+ public Long suitModuleID;
+}

src/main/java/com/christophecvb/elitedangerous/events/loadout/LoadoutRemoveModuleEvent.java

@@ -0,0 +1,4 @@
+package com.christophecvb.elitedangerous.events.loadout;
+
+public class LoadoutRemoveModuleEvent extends LoadoutEquipModuleEvent {
+}

src/main/java/com/christophecvb/elitedangerous/events/loadout/RenameSuitLoadoutEvent.java

@@ -0,0 +1,4 @@
+package com.christophecvb.elitedangerous.events.loadout;
+
+public class RenameSuitLoadoutEvent extends LoadoutBaseEvent {
+}

src/main/java/com/christophecvb/elitedangerous/events/loadout/SwitchSuitLoadoutEvent.java

@@ -0,0 +1,13 @@
+package com.christophecvb.elitedangerous.events.loadout;
+
+import java.util.ArrayList;
+
+public class SwitchSuitLoadoutEvent extends LoadoutBaseEvent {
+ public ArrayList<Module> modules;
+
+ public static class Module {
+ public String slotName;
+ public Long suitModuleID;
+ public String moduleName;
+ }
+}

src/main/java/com/christophecvb/elitedangerous/events/other/EmbarkEvent.java

@@ -0,0 +1,19 @@
+package com.christophecvb.elitedangerous.events.other;
+
+import com.christophecvb.elitedangerous.events.Event;
+
+public class EmbarkEvent extends Event {
+ public Boolean SRV;
+ public Boolean taxi;
+ public Boolean multicrew;
+ public Long ID;
+ public String starSystem;
+ public Long systemAddress;
+ public String body;
+ public Long bodyID;
+ public Boolean onStation;
+ public Boolean onPlanet;
+ public String stationName;
+ public String stationType;
+ public Long marketID;
+}

src/main/java/com/christophecvb/elitedangerous/events/other/ShipLockerMaterialsEvent.java

@@ -0,0 +1,18 @@
+package com.christophecvb.elitedangerous.events.other;
+
+import com.christophecvb.elitedangerous.events.Event;
+import com.christophecvb.elitedangerous.models.material.Item;
+
+import java.util.ArrayList;
+
+public class ShipLockerMaterialsEvent extends Event {
+ public ArrayList<LockerItem> items;
+ public ArrayList<LockerItem> components;
+ public ArrayList<LockerItem> consumables;
+ public ArrayList<LockerItem> data;
+
+ public static class LockerItem extends Item {
+ public Long ownerID;
+ public Long missionID;
+ }
+}

src/main/java/com/christophecvb/elitedangerous/events/other/UpgradeSuitEvent.java

@@ -0,0 +1,13 @@
+package com.christophecvb.elitedangerous.events.other;
+
+import com.christophecvb.elitedangerous.events.Event;
+import com.google.gson.annotations.SerializedName;
+
+public class UpgradeSuitEvent extends Event {
+ public String name;
+ public String nameLocalised;
+ public Long suitID;
+ @SerializedName("Class")
+ public Integer suitClass;
+ public Long cost;
+}

src/main/java/com/christophecvb/elitedangerous/events/other/UpgradeWeaponEvent.java

@@ -0,0 +1,13 @@
+package com.christophecvb.elitedangerous.events.other;
+
+import com.christophecvb.elitedangerous.events.Event;
+import com.google.gson.annotations.SerializedName;
+
+public class UpgradeWeaponEvent extends Event {
+ public String name;
+ public String nameLocalised;
+ public Long suitModuleID;
+ @SerializedName("Class")
+ public Integer weaponClass;
+ public Long cost;
+}

src/main/java/com/christophecvb/elitedangerous/events/trade/TradeMicroResourcesEvent.java

@@ -0,0 +1,14 @@
+package com.christophecvb.elitedangerous.events.trade;
+
+import com.christophecvb.elitedangerous.events.Event;
+import com.christophecvb.elitedangerous.models.MicroResource;
+
+import java.util.ArrayList;
+
+public class TradeMicroResourcesEvent extends Event {
+ public ArrayList<MicroResource> offered;
+ public String received;
+ public Integer count;
+ public Long marketID;
+}
+

src/main/java/com/christophecvb/elitedangerous/models/MicroResource.java

@@ -0,0 +1,18 @@
+package com.christophecvb.elitedangerous.models;
+
+public class MicroResource {
+ public String name;
+ public String nameLocalised;
+ public Category category;
+ public Integer count;
+
+ public enum Category {
+ Encoded,
+ Raw,
+ Manufactured,
+ Item,
+ Component,
+ Data,
+ Consumable,
+ }
+}

src/main/java/com/christophecvb/elitedangerous/models/OrganicData.java

@@ -0,0 +1,6 @@
+package com.christophecvb.elitedangerous.models;
+
+public class OrganicData {
+ public String genus;
+ public String species;
+}