diff --git a/README.md b/README.md index d1a5be1..112075a 100644 --- a/README.md +++ b/README.md @@ -34,4 +34,6 @@ Displays an indicator showing how much progress you've made on your current acti - `1.05` - Add double ammo mould support - Add settings for customizable colors for progress bar - - Updated for RuneLite version 1.9.13.3 \ No newline at end of file + - Updated for RuneLite version 1.9.13.3 +- `1.06` + - Add support for weaving \ No newline at end of file diff --git a/build.gradle b/build.gradle index e777d20..ae01c69 100644 --- a/build.gradle +++ b/build.gradle @@ -24,6 +24,7 @@ dependencies { compileOnly group: 'net.runelite', name:'client', version: runeLiteVersion testImplementation group: 'net.runelite', name:'client', version: runeLiteVersion testImplementation group: 'net.runelite', name:'jshell', version: runeLiteVersion + implementation 'javax.annotation:javax.annotation-api:1.3.2' } group = 'com.github.calebwhiting.runelite' diff --git a/runelite-plugin.properties b/runelite-plugin.properties index 8676819..dbf0794 100644 --- a/runelite-plugin.properties +++ b/runelite-plugin.properties @@ -1,7 +1,7 @@ # suppress inspection "UnusedProperty" for whole file displayName=Action Progress author=Caleb Whiting -support=https://github.com/CalebWhiting/runelite-plugin-action-progress +support=https://github.com/guillaume009/runelite-plugin-action-progress description=Display action progress tags=progress,skill,skilling,action,display,crafting,smithing,fletching,cooking,herblore,dialog,status,tempoross plugins=com.github.calebwhiting.runelite.plugins.actionprogress.ActionProgressPlugin \ No newline at end of file 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 61237e6..a33aabb 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 @@ -22,6 +22,8 @@ public enum Action CRAFT_LEATHER("Leather-working", ActionProgressConfig::craftLeatherWorking, ActionIcon.SPRITE_CRAFTING, 3), CRAFT_MOLTEN_GLASS("Creating", ActionProgressConfig::craftMakeMoltenGlass, ActionIcon.SPRITE_CRAFTING, 2), CRAFT_STRING_JEWELLERY("Stringing", ActionProgressConfig::craftStringJewellery, ActionIcon.SPRITE_CRAFTING, 2), + CRAFT_LOOM("Weaving,", ActionProgressConfig::craftWeaving,ActionIcon.SPRITE_CRAFTING, 4, 3), + CRAFT_LOOM_DRIFT_NET("Weaving,", ActionProgressConfig::craftWeaving,ActionIcon.SPRITE_CRAFTING, 3, 3), FLETCH_ATTACH_FEATHER("Attaching", ActionProgressConfig::fletchArrowsAndBolts, ActionIcon.SPRITE_FLETCHING, 2), FLETCH_ATTACH_TIPS("Attaching", ActionProgressConfig::fletchArrowsAndBolts, ActionIcon.SPRITE_FLETCHING, 2), FLETCH_CUT_ARROW_SHAFT("Cutting", ActionProgressConfig::fletchArrowsAndBolts, ActionIcon.SPRITE_FLETCHING, 3), @@ -43,13 +45,7 @@ public enum Action TEMPOROSS_COOKING("Cooking", ActionProgressConfig::temporossCooking, ActionIcon.SPRITE_COOKING, 4, 3), TEMPOROSS_FILL_CRATE("Filling", ActionProgressConfig::temporossFiring, ActionIcon.SPRITE_FISHING, 2), TEMPOROSS_REWARD_POOL("Fishing", ActionProgressConfig::temporossRewardPool, ActionIcon.SPRITE_FISHING, 1, 3), - WINTERTODT_WOODCUTTING( - "Chopping", - ActionProgressConfig::wintertodtWoodcutting, - ActionIcon.SPRITE_WOODCUTTING, - 2, - 3 - ), + WINTERTODT_WOODCUTTING("Chopping", ActionProgressConfig::wintertodtWoodcutting, ActionIcon.SPRITE_WOODCUTTING, 2, 3), WINTERTODT_FIREMAKING("Lighting", ActionProgressConfig::wintertodtLighting, ActionIcon.SPRITE_FIREMAKING, 4, 3), WINTERTODT_FLETCHING("Cutting", ActionProgressConfig::wintertodtFletching, ActionIcon.SPRITE_FLETCHING, 4, 4); 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 d37d642..8178896 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 @@ -290,6 +290,18 @@ default boolean craftBattlestaves() return true; } + + @ConfigItem( + name = "Weaving", + keyName = "crafting.waeving", + description = "Enable/Disable monitoring for items crafted at a loom.", + section = CRAFTING + ) + default boolean craftWeaving() + { + return true; + } + @ConfigItem( name = "Arrows & bolts", keyName = "fletching.ammunition", @@ -476,5 +488,5 @@ default boolean grinding() { return true; } - + } 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 91eed87..457c5e8 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 @@ -127,6 +127,10 @@ public class ChatboxDetector extends ActionDetector new Product(CRAFT_BLOW_GLASS, UNPOWERED_ORB, new Ingredient(MOLTEN_GLASS)), new Product(CRAFT_BLOW_GLASS, LANTERN_LENS, new Ingredient(MOLTEN_GLASS)), new Product(CRAFT_BLOW_GLASS, EMPTY_LIGHT_ORB, new Ingredient(MOLTEN_GLASS)), + new Product(CRAFT_LOOM, BASKET, new Ingredient(WILLOW_BRANCH, 6)), + new Product(CRAFT_LOOM, EMPTY_SACK, new Ingredient(JUTE_FIBRE, 4)), + new Product(CRAFT_LOOM_DRIFT_NET, DRIFT_NET, new Ingredient(JUTE_FIBRE, 2)), + new Product(CRAFT_LOOM, STRIP_OF_CLOTH, new Ingredient(BALL_OF_WOOL, 4)), new Product(FLETCH_CUT_BOW, LONGBOW_U, new Ingredient(LOGS)), new Product(FLETCH_CUT_BOW, OAK_LONGBOW_U, new Ingredient(OAK_LOGS)), new Product(FLETCH_CUT_BOW, WILLOW_LONGBOW_U, new Ingredient(WILLOW_LOGS)),