diff --git a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java index c56a8a2591..c6452700e9 100644 --- a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java +++ b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java @@ -54,6 +54,7 @@ public class RuneLiteAPI private static final Logger logger = LoggerFactory.getLogger(RuneLiteAPI.class); public static final String RUNELITE_AUTH = "RUNELITE-AUTH"; + public static final String RUNELITE_MACHINEID = "RUNELITE-MACHINEID"; public static final OkHttpClient CLIENT; public static final Gson GSON = new Gson(); diff --git a/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeClient.java b/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeClient.java index 71ea20b533..c48f5b74fc 100644 --- a/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeClient.java +++ b/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeClient.java @@ -27,7 +27,7 @@ package net.runelite.http.api.ge; import com.google.gson.Gson; import java.io.IOException; import java.util.UUID; -import lombok.AllArgsConstructor; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import net.runelite.http.api.RuneLiteAPI; import static net.runelite.http.api.RuneLiteAPI.JSON; @@ -39,12 +39,14 @@ import okhttp3.RequestBody; import okhttp3.Response; @Slf4j -@AllArgsConstructor public class GrandExchangeClient { private static final Gson GSON = RuneLiteAPI.GSON; - private final UUID uuid; + @Setter + private UUID uuid; + @Setter + private String machineId; public void submit(GrandExchangeTrade grandExchangeTrade) { @@ -53,8 +55,17 @@ public class GrandExchangeClient .build(); RequestBody body = RequestBody.Companion.create(GSON.toJson(grandExchangeTrade), JSON); - Request request = new Request.Builder() - .header(RuneLiteAPI.RUNELITE_AUTH, uuid.toString()) + Request.Builder builder = new Request.Builder(); + if (uuid != null) + { + builder.header(RuneLiteAPI.RUNELITE_AUTH, uuid.toString()); + } + if (machineId != null) + { + builder.header(RuneLiteAPI.RUNELITE_MACHINEID, machineId); + } + + Request request = builder .post(body) .url(url) .build(); diff --git a/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java b/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java index b5d0012b16..a3ef3f484d 100644 --- a/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java +++ b/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java @@ -24,15 +24,18 @@ */ package net.runelite.http.api.ge; -import java.time.Instant; import lombok.Data; +import net.runelite.http.api.worlds.WorldType; @Data public class GrandExchangeTrade { private boolean buy; + private boolean cancel; private int itemId; private int quantity; + private int total; private int price; - private Instant time; + private int offer; + private WorldType worldType; } diff --git a/runelite-api/src/main/java/net/runelite/api/AnimationID.java b/runelite-api/src/main/java/net/runelite/api/AnimationID.java index 906ddcafcb..b7876dee9e 100644 --- a/runelite-api/src/main/java/net/runelite/api/AnimationID.java +++ b/runelite-api/src/main/java/net/runelite/api/AnimationID.java @@ -130,8 +130,11 @@ public final class AnimationID public static final int FISHING_BAREHAND_CAUGHT_TUNA_1 = 6710; public static final int FISHING_BAREHAND_CAUGHT_TUNA_2 = 6711; public static final int FISHING_PEARL_ROD = 8188; - public static final int FISHING_PEARL_FLY_ROD = 8192; - public static final int FISHING_PEARL_BARBARIAN_ROD = 8193; + public static final int FISHING_PEARL_FLY_ROD = 8189; + public static final int FISHING_PEARL_BARBARIAN_ROD = 8190; + public static final int FISHING_PEARL_ROD_2 = 8191; + public static final int FISHING_PEARL_FLY_ROD_2 = 8192; + public static final int FISHING_PEARL_BARBARIAN_ROD_2 = 8193; public static final int FISHING_PEARL_OILY_ROD = 6932; public static final int MINING_BRONZE_PICKAXE = 625; public static final int MINING_IRON_PICKAXE = 626; diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java index 513c8171ac..8753b38264 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -11472,5 +11472,15 @@ public final class ItemID public static final int LOGS_24650 = 24650; public static final int RAW_SHRIMPS_24652 = 24652; public static final int BONES_24655 = 24655; + public static final int ENRAGED_TEKTINY = 24656; + public static final int FLYING_VESPINA = 24658; + public static final int MASSIVE_STORAGE_UNIT = 24660; + public static final int MASSIVE_STORAGE_UNIT_24661 = 24661; + public static final int MASSIVE_STORAGE_UNIT_24662 = 24662; + public static final int MASSIVE_STORAGE_UNIT_24663 = 24663; + public static final int TWISTED_ANCESTRAL_HAT = 24664; + public static final int TWISTED_ANCESTRAL_ROBE_TOP = 24666; + public static final int TWISTED_ANCESTRAL_ROBE_BOTTOM = 24668; + public static final int TWISTED_ANCESTRAL_COLOUR_KIT = 24670; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java index d2b8833f58..d516dec046 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -8512,5 +8512,9 @@ public final class NpcID public static final int ACCOUNT_SECURITY_TUTOR = 9504; public static final int HAMELN_THE_JESTER_9505 = 9505; public static final int HANCHEN_THE_HOUND_9506 = 9506; + public static final int ENRAGED_TEKTINY = 9511; + public static final int FLYING_VESPINA = 9512; + public static final int ENRAGED_TEKTINY_9513 = 9513; + public static final int FLYING_VESPINA_9514 = 9514; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java index b57c30a4ad..4272c68378 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -12975,5 +12975,11 @@ public final class NullItemID public static final int NULL_24651 = 24651; public static final int NULL_24653 = 24653; public static final int NULL_24654 = 24654; + public static final int NULL_24657 = 24657; + public static final int NULL_24659 = 24659; + public static final int NULL_24665 = 24665; + public static final int NULL_24667 = 24667; + public static final int NULL_24669 = 24669; + public static final int NULL_24671 = 24671; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java index a11256b413..12e20de7a5 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -18335,5 +18335,7 @@ public final class NullObjectID public static final int NULL_37958 = 37958; public static final int NULL_37960 = 37960; public static final int NULL_37962 = 37962; + public static final int NULL_37976 = 37976; + public static final int NULL_37977 = 37977; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java index e280976757..a1861aaed0 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -19628,5 +19628,6 @@ public final class ObjectID public static final int TREE_37973 = 37973; public static final int TREE_37974 = 37974; public static final int TREE_37975 = 37975; + public static final int MASSIVE_STORAGE_UNIT = 37978; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java index 65b47bbbce..189d7f5a37 100644 --- a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java +++ b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java @@ -599,4 +599,4 @@ public class Hooks implements Callbacks ); eventBus.post(FakeXpDrop.class, fakeXpDrop); } -} +} \ No newline at end of file diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index f095a3cacf..866089dd10 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -9764,5 +9764,11 @@ 24638, 24641, 24644 + ], + "massive storage unit": [ + 24660, + 24661, + 24662, + 24663 ] }