diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/cooking/CrowdsourcingCooking.java b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/cooking/CrowdsourcingCooking.java index 37058b5dbe..749ead8ea9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/cooking/CrowdsourcingCooking.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/cooking/CrowdsourcingCooking.java @@ -75,10 +75,16 @@ public class CrowdsourcingCooking // Message prefixes taken from CookingPlugin if (message.startsWith("You successfully cook") || message.startsWith("You successfully bake") + || message.startsWith("You successfully fry") || message.startsWith("You manage to cook") || message.startsWith("You roast a") + || message.startsWith("You spit-roast") || message.startsWith("You cook") + || message.startsWith("You burn") + || message.startsWith("Eventually the Jubbly") + || message.startsWith("Unfortunately the Jubbly") || message.startsWith("You accidentally burn") + || message.startsWith("You half-cook") || message.startsWith("You accidentally spoil")) { boolean inHosidiusKitchen = false; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/woodcutting/CrowdsourcingWoodcutting.java b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/woodcutting/CrowdsourcingWoodcutting.java index 8defbe2b0d..2a52784764 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/woodcutting/CrowdsourcingWoodcutting.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/woodcutting/CrowdsourcingWoodcutting.java @@ -55,25 +55,85 @@ public class CrowdsourcingWoodcutting private static final String INVENTORY_FULL_MESSAGE = "Your inventory is too full to hold any more logs."; private static final String NEST_MESSAGE = "A bird's nest falls out of the tree"; private static final Set TREE_OBJECTS = new ImmutableSet.Builder(). + add(ObjectID.OAK). add(ObjectID.OAK_10820). + add(ObjectID.OAK_8467). + add(ObjectID.OAK_9734). + add(ObjectID.YEW). + add(ObjectID.YEW_TREE_8513). + add(ObjectID.TREE). + add(ObjectID.TREE_1277). add(ObjectID.TREE_1278). + add(ObjectID.TREE_1279). + add(ObjectID.TREE_1280). + add(ObjectID.DEAD_TREE). + add(ObjectID.DEAD_TREE_1283). + add(ObjectID.DEAD_TREE_1284). + add(ObjectID.DEAD_TREE_1285). + add(ObjectID.DEAD_TREE_1286). + add(ObjectID.DEAD_TREE_1289). + add(ObjectID.DEAD_TREE_1290). + add(ObjectID.DEAD_TREE_1291). + add(ObjectID.EVERGREEN). + add(ObjectID.EVERGREEN_1319). + add(ObjectID.TREE_1330). + add(ObjectID.TREE_1331). + add(ObjectID.TREE_1332). + add(ObjectID.DEAD_TREE_1365). + add(ObjectID.DEAD_TREE_1383). + add(ObjectID.DEAD_TREE_1384). + add(ObjectID.EVERGREEN_2091). + add(ObjectID.EVERGREEN_2092). + add(ObjectID.TREE_2409). + add(ObjectID.TREE_3879). + add(ObjectID.TREE_3881). + add(ObjectID.TREE_3882). + add(ObjectID.TREE_3883). + add(ObjectID.DEAD_TREE_5902). + add(ObjectID.DEAD_TREE_5903). + add(ObjectID.DEAD_TREE_5904). + add(ObjectID.TREE_9730). + add(ObjectID.TREE_9731). + add(ObjectID.TREE_9732). + add(ObjectID.TREE_9733). + add(ObjectID.TREE_10041). + add(ObjectID.TREE_14308). + add(ObjectID.TREE_14309). + add(ObjectID.TREE_16264). + add(ObjectID.TREE_16265). + add(ObjectID.EVERGREEN_27060). + add(ObjectID.BURNT_TREE). + add(ObjectID.BURNT_TREE_30854). + + add(ObjectID.MATURE_JUNIPER_TREE). + add(ObjectID.WILLOW). add(ObjectID.WILLOW_10829). add(ObjectID.WILLOW_10831). add(ObjectID.WILLOW_10833). + add(ObjectID.WILLOW_TREE_8488). add(ObjectID.SCRAPEY_TREE). add(ObjectID.JUNGLE_TREE_15951). add(ObjectID.JUNGLE_TREE_15954). add(ObjectID.JUNGLE_TREE_15948). add(ObjectID.MAPLE_TREE_10832). + add(ObjectID.MAPLE_TREE_4674). + add(ObjectID.MAPLE_TREE_8444). add(ObjectID.MAHOGANY). add(ObjectID.TEAK). + add(ObjectID.TEAK_15062). add(ObjectID.MAGIC_TREE_10834). + add(ObjectID.MAGIC_TREE_8409). add(ObjectID.HOLLOW_TREE_10821). add(ObjectID.HOLLOW_TREE_10830). add(ObjectID.ACHEY_TREE). + add(ObjectID.REDWOOD). + add(ObjectID.REDWOOD_29670). + add(ObjectID.BRUMA_ROOTS). + add(ObjectID.ARCTIC_PINE). + add(ObjectID.SULLIUSCEP). build(); private static final Map AXE_ANIMS = new ImmutableMap.Builder(). @@ -103,8 +163,13 @@ public class CrowdsourcingWoodcutting add("You get some mahogany logs and give them to Carpenter Kjallak."). add("You get some yew logs."). add("You get some magic logs."). + add("You get some redwood logs."). add("You get some scrapey tree logs."). add("You get some bark."). + add("You get a bruma root."). + add("You get an arctic pine log"). + add("You get some juniper logs."). + add("You get some mushrooms."). build(); @Inject