From 4ec07e528f0a5557ad235381a8f485115068e55c Mon Sep 17 00:00:00 2001 From: Krytlex Date: Mon, 2 Sep 2024 09:26:45 -0400 Subject: [PATCH] Add support for churning --- README.md | 1 + .../runelite/plugins/actionprogress/Action.java | 9 ++++++++- .../plugins/actionprogress/ActionProgressConfig.java | 11 +++++++++++ .../actionprogress/detect/ChatboxDetector.java | 9 ++++++++- 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 70cc3b0..ca3910b 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ Displays an indicator showing how much progress you've made on your current acti - Cutting fruits - Mixing pastry & wine - Topping pizza + - Churning dairy products - Smithing - Smelting - Smithing diff --git a/src/main/java/com/github/calebwhiting/runelite/plugins/actionprogress/Action.java b/src/main/java/com/github/calebwhiting/runelite/plugins/actionprogress/Action.java index 3316750..a3105a3 100644 --- a/src/main/java/com/github/calebwhiting/runelite/plugins/actionprogress/Action.java +++ b/src/main/java/com/github/calebwhiting/runelite/plugins/actionprogress/Action.java @@ -70,7 +70,14 @@ public enum Action FIREMAKING_CAMPFIRE("Tending",ActionProgressConfig::campfire, ActionIcon.SPRITE_FIREMAKING,5,4), GUARDIAN_OF_THE_RIFT_CRAFTING("Crafting", ActionProgressConfig::guardianOfTheRiftCrafting, ActionIcon.SPRITE_CRAFTING, 1), //Timing might be off. Not on the wiki. Will need to confirm when having more rewards points - GUARDIAN_OF_THE_RIFT_REWARD_POOL("Searching", ActionProgressConfig::guardianOfTheRiftRewardPool, ActionIcon.SPRITE_GUARDIAN_OF_THE_RIFT_REWARD, 3); + GUARDIAN_OF_THE_RIFT_REWARD_POOL("Searching", ActionProgressConfig::guardianOfTheRiftRewardPool, ActionIcon.SPRITE_GUARDIAN_OF_THE_RIFT_REWARD, 3), + CHURNING_CREAM("Churning", ActionProgressConfig::cookingChurning, ActionIcon.SPRITE_COOKING,10), + CHURNING_BUTTER_WITH_MILK("Churning", ActionProgressConfig::cookingChurning, ActionIcon.SPRITE_COOKING,19), + CHURNING_BUTTER_WITH_CREAM("Churning", ActionProgressConfig::cookingChurning, ActionIcon.SPRITE_COOKING,10), + CHURNING_CHEESE_WITH_MILK("Churning", ActionProgressConfig::cookingChurning, ActionIcon.SPRITE_COOKING,26), + CHURNING_CHEESE_WITH_CREAM("Churning", ActionProgressConfig::cookingChurning, ActionIcon.SPRITE_COOKING,19), + CHURNING_CHEESE_WITH_BUTTER("Churning", ActionProgressConfig::cookingChurning, ActionIcon.SPRITE_COOKING,10), + CHURNING_CHEESE_WITH_GARLIC("Churning", ActionProgressConfig::cookingChurning, ActionIcon.SPRITE_COOKING,10); private final String description; diff --git a/src/main/java/com/github/calebwhiting/runelite/plugins/actionprogress/ActionProgressConfig.java b/src/main/java/com/github/calebwhiting/runelite/plugins/actionprogress/ActionProgressConfig.java index 4cc6778..2cd12b2 100644 --- a/src/main/java/com/github/calebwhiting/runelite/plugins/actionprogress/ActionProgressConfig.java +++ b/src/main/java/com/github/calebwhiting/runelite/plugins/actionprogress/ActionProgressConfig.java @@ -210,6 +210,17 @@ default boolean cookingCutFruit() return true; } + @ConfigItem( + name = "Dairy churning", + keyName = "cooking.churning", + description = "Enable/Disable monitoring churning dairy products.", + section = COOKING + ) + default boolean cookingChurning() + { + return true; + } + @ConfigItem( name = "Smelting Items", keyName = "smithing.smelting", diff --git a/src/main/java/com/github/calebwhiting/runelite/plugins/actionprogress/detect/ChatboxDetector.java b/src/main/java/com/github/calebwhiting/runelite/plugins/actionprogress/detect/ChatboxDetector.java index 0f3a38b..f742078 100644 --- a/src/main/java/com/github/calebwhiting/runelite/plugins/actionprogress/detect/ChatboxDetector.java +++ b/src/main/java/com/github/calebwhiting/runelite/plugins/actionprogress/detect/ChatboxDetector.java @@ -235,7 +235,14 @@ public class ChatboxDetector extends ActionDetector new Product(FLETCH_ATTACH, DIAMOND_BOLTS, new Ingredient(ADAMANT_BOLTS,10) , new Ingredient(DIAMOND_BOLT_TIPS,10)), new Product(FLETCH_ATTACH, DRAGONSTONE_BOLTS, new Ingredient(RUNITE_BOLTS,10) , new Ingredient(DRAGONSTONE_BOLT_TIPS,10)), new Product(FLETCH_ATTACH, ONYX_BOLTS, new Ingredient(RUNITE_BOLTS,10) , new Ingredient(ONYX_BOLT_TIPS,10)), - new Product(FARM_ULTRA_COMPOST, ULTRACOMPOST, new Ingredient(VOLCANIC_ASH,2), new Ingredient(SUPERCOMPOST)) + new Product(FARM_ULTRA_COMPOST, ULTRACOMPOST, new Ingredient(VOLCANIC_ASH,2), new Ingredient(SUPERCOMPOST)), + new Product(CHURNING_CREAM, POT_OF_CREAM, new Ingredient(BUCKET_OF_MILK)), + new Product(CHURNING_BUTTER_WITH_MILK, PAT_OF_BUTTER, new Ingredient(BUCKET_OF_MILK)), + new Product(CHURNING_BUTTER_WITH_CREAM, PAT_OF_BUTTER, new Ingredient(POT_OF_CREAM)), + new Product(CHURNING_CHEESE_WITH_MILK, CHEESE, new Ingredient(BUCKET_OF_MILK)), + new Product(CHURNING_CHEESE_WITH_CREAM, CHEESE, new Ingredient(POT_OF_CREAM)), + new Product(CHURNING_CHEESE_WITH_BUTTER, CHEESE, new Ingredient(PAT_OF_BUTTER)), + new Product(CHURNING_CHEESE_WITH_GARLIC, CHEESE, new Ingredient(PAT_OF_NOT_GARLIC_BUTTER)), // @formatter:on };