Ass support for forester's ration

JonneSaloranta · Jul 22, 2024 · b4ecf55 · b4ecf55
1 parent feb84bd
commit b4ecf55
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -34,6 +34,7 @@ Displays an indicator showing how much progress you've made on your current acti
 	- Arrows & bolts
 	- Creating bows, crossbows & shields
     - Javelins
+    - Spinning bowstring
 - Herblore
 	- Herb cleaning
 	- Mixing potions
@@ -64,6 +65,8 @@ Displays an indicator showing how much progress you've made on your current acti
 
 
 ## Changes
+- `1.16`
+	- Add support for spinning bowstring
 - `1.15`
 	- Add support for jug of sunfire wine
 - `1.14`

diff --git a/build.gradle b/build.gradle
@@ -19,16 +19,16 @@ dependencies {
 	compileOnly 'org.projectlombok:lombok:1.18.20'
 	annotationProcessor 'org.projectlombok:lombok:1.18.20'
 
-	testImplementation 'junit:junit:4.12'
+	testImplementation 'junit:junit:4.13.1'
 
 	compileOnly group: 'net.runelite', name:'client', version: runeLiteVersion
 	testImplementation group: 'net.runelite', name:'client', version: runeLiteVersion
 	testImplementation group: 'net.runelite', name:'jshell', version: runeLiteVersion
 }
 
 group = 'com.github.calebwhiting.runelite'
-version = '1.15'
-sourceCompatibility = '1.8'
+version = '1.16'
+sourceCompatibility = '1.11'
 
 tasks.withType(JavaCompile) {
 	options.encoding = 'UTF-8'

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
@@ -38,6 +38,7 @@ public enum Action
 	FLETCH_CUT_CROSSBOW("Cutting", ActionProgressConfig::fletchCrossbows, ActionIcon.SPRITE_FLETCHING, 2, 3),
 	FLETCH_ATTACH_CROSSBOW("Attaching", ActionProgressConfig::fletchCrossbows, ActionIcon.SPRITE_FLETCHING, 2),
 	FLETCH_STRING_CROSSBOW("Stringing", ActionProgressConfig::fletchCrossbows, ActionIcon.SPRITE_FLETCHING, 2),
+	FLETCH_SPINNING("Spinning", ActionProgressConfig::fletchSpinning, ActionIcon.SPRITE_FLETCHING, 3),
 	FLETCH_JAVELIN("Attaching", ActionProgressConfig::fletchJavelin, ActionIcon.SPRITE_FLETCHING, 2),
 	FLETCH_DART("Attaching", ActionProgressConfig::fletchArrowsAndBolts, ActionIcon.SPRITE_FLETCHING, 2),
 	GRIND("Grinding", ActionProgressConfig::grinding, ActionIcon.SPRITE_TOTAL, 0, 2, 3),

diff --git a/...in/java/com/github/calebwhiting/runelite/plugins/actionprogress/ActionProgressConfig.java b/...in/java/com/github/calebwhiting/runelite/plugins/actionprogress/ActionProgressConfig.java
@@ -387,6 +387,17 @@ default boolean fletchCrossbows()
 		return true;
 	}
 
+	@ConfigItem(
+			name = "Spinning flax",
+			keyName = "fletching.spinning",
+			description = "Enable/Disable monitoring spinning flax into bowstring.",
+			section = FLETCHING
+	)
+	default boolean fletchSpinning()
+	{
+		return true;
+	}
+
 	@ConfigItem(
 			name = "Making shields",
 			keyName = "fletching.shields",

diff --git a/.../java/com/github/calebwhiting/runelite/plugins/actionprogress/detect/ChatboxDetector.java b/.../java/com/github/calebwhiting/runelite/plugins/actionprogress/detect/ChatboxDetector.java
@@ -163,6 +163,7 @@ public class ChatboxDetector extends ActionDetector
             new Product(FLETCH_STRING_BOW, MAPLE_SHORTBOW, new Ingredient(MAPLE_SHORTBOW_U), new Ingredient(BOW_STRING)),
             new Product(FLETCH_STRING_BOW, YEW_SHORTBOW, new Ingredient(YEW_SHORTBOW_U), new Ingredient(BOW_STRING)),
             new Product(FLETCH_STRING_BOW, MAGIC_SHORTBOW, new Ingredient(MAGIC_SHORTBOW_U), new Ingredient(BOW_STRING)),
+			new Product(FLETCH_SPINNING, BOW_STRING, new Ingredient(FLAX)),
 			new Product(FLETCH_SHIELD, OAK_SHIELD, new Ingredient(OAK_LOGS, 2)),
 			new Product(FLETCH_SHIELD, WILLOW_SHIELD, new Ingredient(WILLOW_LOGS, 2)),
 			new Product(FLETCH_SHIELD, MAPLE_SHIELD, new Ingredient(MAPLE_LOGS, 2)),