TaskApp integration

build.gradle

@@ -16,7 +16,7 @@ plugins {
 }
 
 group = 'com.collectionlogmaster'
-version = '1.3.1'
+version = '2.0.0-beta3'
 
 repositories {
     mavenLocal()
@@ -30,28 +30,37 @@ repositories {
 }
 
 def runeLiteVersion = 'latest.release'
+def pluginMainClass = 'com.collectionlogmaster.CollectionLogMasterPluginTest'
 
 dependencies {
     compileOnly group: 'net.runelite', name:'client', version: runeLiteVersion
 
     compileOnly 'org.jetbrains:annotations:23.0.0'
-    compileOnly 'org.projectlombok:lombok:1.18.30'
-    annotationProcessor 'org.projectlombok:lombok:1.18.30'
+	compileOnly 'org.projectlombok:lombok:1.18.30'
+	annotationProcessor 'org.projectlombok:lombok:1.18.30'
 
-    testImplementation 'junit:junit:4.12'
-    testImplementation group: 'net.runelite', name:'client', version: runeLiteVersion
-    testImplementation group: 'net.runelite', name:'jshell', version: runeLiteVersion
+	testImplementation 'junit:junit:4.12'
+	testImplementation group: 'net.runelite', name:'client', version: runeLiteVersion
+	testImplementation group: 'net.runelite', name:'jshell', version: runeLiteVersion
 }
 
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8'
     options.release.set(11)
 }
 
+tasks.register('run', JavaExec) {
+	classpath = sourceSets.test.runtimeClasspath
+	mainClass = pluginMainClass
+
+	jvmArgs "-ea"
+	args "--developer-mode", "--debug"
+}
+
 tasks.register('shadowJar', Jar) {
     dependsOn configurations.testRuntimeClasspath
     manifest {
-        attributes('Main-Class': 'com.collectionlogmaster.CollectionLogMasterPluginTest', 'Multi-Release': true)
+        attributes('Main-Class': pluginMainClass, 'Multi-Release': true)
     }
 
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE

runelite-plugin.properties

@@ -2,4 +2,5 @@ displayName=Collection Log Master
 author=ImTedious
 description=In-game dashboard to roll your next grind; official plugin for the Taskman game mode
 tags=task,tasker,taskman,taskapp,generate,collection,log,generatetask,tedious
-plugins=com.collectionlogmaster.CollectionLogMasterPlugin
+plugins=com.collectionlogmaster.CollectionLogMasterPlugin
+build=gradle

src/main/java/com/collectionlogmaster/CollectionLogMasterConfig.java

@@ -11,10 +11,55 @@ public interface CollectionLogMasterConfig extends Config
 {
 	String CONFIG_GROUP = "collection-log-master";
 
+	String TASK_APP_SECTION = "taskApp";
+	String TASK_APP_USERNAME = TASK_APP_SECTION + ".username";
+	String TASK_APP_PASSWORD = TASK_APP_SECTION + ".password";
+
+	String GENERAL_SECTION = "general";
+
 	String PLUGIN_VERSION_KEY = "plugin-version";
-	String IS_LMS_ENABLED_KEY = "isLMSEnabled";
 	String IS_COMMAND_ENABLED_KEY = "isCommandEnabled";
 
+	@ConfigSection(
+		name = "TaskApp Credentials",
+		description = "The credentials for your account in TaskApp (osrstaskapp.com)",
+		position = 10
+	)
+	String taskAppSection = TASK_APP_SECTION;
+
+	@ConfigItem(
+		keyName = TASK_APP_USERNAME,
+		name = "Username",
+		description = "Your account's username in TaskApp (osrstaskapp.com)",
+		section = taskAppSection,
+		position = 11
+	)
+	default String username()
+	{
+		return "";
+	}
+
+	@ConfigItem(
+		keyName = TASK_APP_PASSWORD,
+		name = "Password",
+		description = "Your account's password in TaskApp (osrstaskapp.com)",
+		section = taskAppSection,
+		secret = true,
+		position = 12
+	)
+	default String password()
+	{
+		return "";
+	}
+
+
+	@ConfigSection(
+		name = "General",
+		description = "General settings to control the plugin's behavior and appearance",
+		position = 20
+	)
+	String generalSection = GENERAL_SECTION;
+
 	@Range(
 			min = 1000,
 			max = 10000
@@ -24,7 +69,8 @@ public interface CollectionLogMasterConfig extends Config
 			keyName = "rollTime",
 			name = "Roll Time",
 			description = "How long new tasks will take to roll",
-			position = 1
+			section = generalSection,
+			position = 21
 	)
 	default int rollTime()
 	{
@@ -34,8 +80,9 @@ default int rollTime()
 	@ConfigItem(
 			keyName = "rollPastCompleted",
 			name = "Roll past completed",
-			description = "When rolling tasks, include those you've already completed in the roll animation. Helpful when you're getting to the end of a tier!",
-			position = 2
+			description = "Include tasks you've already completed in the roll animation. Helpful when you're getting to the end of a tier!",
+			section = generalSection,
+			position = 22
 	)
 	default boolean rollPastCompleted()
 	{
@@ -46,7 +93,8 @@ default boolean rollPastCompleted()
 			keyName = "hideBelow",
 			name = "Hide Tasks Below",
 			description = "Disabled the showing up/assigning of tasks at or below the specified tier",
-			position = 3
+			section = generalSection,
+			position = 23
 	)
 	default TaskTier hideBelow()
 	{
@@ -57,7 +105,8 @@ default TaskTier hideBelow()
 			keyName = "displayCurrentTaskOverlay",
 			name = "Display current task overlay",
 			description = "Enable an overlay showing the currently assigned task (when one exists)",
-			position = 5
+			section = generalSection,
+			position = 24
 	)
 	default boolean displayCurrentTaskOverlay()
 	{
@@ -68,37 +117,27 @@ default boolean displayCurrentTaskOverlay()
 			keyName = "dynamicTaskImages",
 			name = "Dynamic task images",
 			description = "Display dynamic task images based on required/acquired items",
-			position = 6
+			section = generalSection,
+			position = 25
 	)
 	default DynamicTaskImages dynamicTaskImages()
 	{
 		return DynamicTaskImages.COMPLETE;
 	}
 
-	@ConfigItem(
-			keyName = IS_LMS_ENABLED_KEY,
-			name = "Enable LMS tasks",
-			description = "Whether to include LMS tasks in the list.",
-			position = 7
-	)
-	default boolean isLMSEnabled()
-	{
-		return true;
-	}
-
 	@ConfigSection(
 			name = "!taskman Command",
 			description = "Configuration options for the !taskman command",
-			position = 8
+			position = 30
 	)
-	String command = "command";
+	String commandSection = "command";
 
 	@ConfigItem(
 			keyName = IS_COMMAND_ENABLED_KEY,
 			name = "Enable command",
 			description = "When you or others type !taskman in the chat, it will be replaced by your current task status",
-			section = command,
-			position = 0
+			section = commandSection,
+			position = 31
 	)
 	default boolean isCommandEnabled()
 	{

src/main/java/com/collectionlogmaster/CollectionLogMasterPlugin.java

@@ -1,12 +1,12 @@
 package com.collectionlogmaster;
 
-import com.collectionlogmaster.command.DevCommandsManager;
 import com.collectionlogmaster.command.TaskmanCommandManager;
 import com.collectionlogmaster.input.MouseManager;
 import com.collectionlogmaster.synchronization.clog.CollectionLogService;
-import com.collectionlogmaster.task.TaskService;
+import com.collectionlogmaster.taskapp.TaskService;
 import com.collectionlogmaster.ui.InterfaceManager;
 import com.collectionlogmaster.ui.TaskOverlay;
+import com.collectionlogmaster.ui.TooltipOverlay;
 import com.collectionlogmaster.util.GsonOverride;
 import com.google.inject.Injector;
 import com.google.inject.Provides;
@@ -33,6 +33,9 @@ public class CollectionLogMasterPlugin extends Plugin {
 	@Inject
 	protected TaskOverlay taskOverlay;
 
+	@Inject
+	protected TooltipOverlay tooltipOverlay;
+
 	@Inject
 	private OverlayManager overlayManager;
 
@@ -54,9 +57,6 @@ public class CollectionLogMasterPlugin extends Plugin {
 	@Inject
 	public TaskmanCommandManager taskmanCommand;
 
-	@Inject
-	public DevCommandsManager devCommands;
-
 	@Override
 	protected void startUp() {
 		CollectionLogMasterPlugin.staticInjector = getInjector();
@@ -67,9 +67,9 @@ protected void startUp() {
 		pluginUpdateNotifier.startUp();
 		interfaceManager.startUp();
 		taskmanCommand.startUp();
-		devCommands.startUp();
 		this.taskOverlay.setResizable(true);
 		this.overlayManager.add(this.taskOverlay);
+		this.overlayManager.add(this.tooltipOverlay);
 	}
 
 	@Override
@@ -80,7 +80,6 @@ protected void shutDown() {
 		pluginUpdateNotifier.shutDown();
 		interfaceManager.shutDown();
 		taskmanCommand.shutDown();
-		devCommands.shutDown();
 		this.overlayManager.remove(this.taskOverlay);
 	}
 

src/main/java/com/collectionlogmaster/PluginUpdateNotifier.java

@@ -23,8 +23,7 @@
 public class PluginUpdateNotifier extends EventBusSubscriber {
 	private static final String[] UPDATE_MESSAGES = {
 			"<colHIGHLIGHT>Collection Log Master updated to v" + getPluginVersion(),
-			"<colHIGHLIGHT>- Fixed issue with disabling LMS tasks while a LMS task is active",
-			"<colHIGHLIGHT>- Fixed issue overlay not being shown under some circumstances",
+			"<colHIGHLIGHT>- Thanks you for trying out the beta version! Please report any issues in Discord.",
 	};
 
 	@Inject

src/main/java/com/collectionlogmaster/command/TaskmanCommandManager.java

@@ -7,7 +7,7 @@
 import com.collectionlogmaster.domain.TaskTier;
 import com.collectionlogmaster.domain.command.CommandRequest;
 import com.collectionlogmaster.domain.command.CommandResponse;
-import com.collectionlogmaster.task.TaskService;
+import com.collectionlogmaster.taskapp.TaskService;
 import com.collectionlogmaster.util.EventBusSubscriber;
 import com.collectionlogmaster.util.HttpClient;
 import com.collectionlogmaster.util.SimpleDebouncer;
@@ -112,7 +112,7 @@ private void executeCommand(ChatMessage chatMessage, String message) {
 		}
 
 		HttpUrl url = baseApiUrl.newBuilder().addPathSegment(senderName).build();
-		httpClient.getHttpRequestAsync(url.toString(), CommandResponse.class)
+		httpClient.get(url, CommandResponse.class)
 				.thenAccept(res ->
 						clientThread.invokeLater(() -> replaceChatMessage(chatMessage, res))
 				);
@@ -145,7 +145,8 @@ public void updateServerImmediately() {
 		float currentProgress = taskService.getProgress().get(currentTier) * 100;
 
 		CommandRequest data = new CommandRequest(taskId, taskService.getCurrentTier().displayName, (int) currentProgress);
-		httpClient.putHttpRequestAsync(url.toString(), GSON.toJson(data), null);
+
+		httpClient.put(url, data, null);
 	}
 
 	private void replaceChatMessage(ChatMessage chatMessage, CommandResponse res) {

src/main/java/com/collectionlogmaster/domain/command/CommandRequest.java

@@ -1,12 +1,15 @@
 package com.collectionlogmaster.domain.command;
 
+import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 
 @Data
 @RequiredArgsConstructor
 public class CommandRequest {
+    @SerializedName("taskId")
     private final String taskId;
     private final String tier;
+    @SerializedName("progressPercentage")
     private final int progressPercentage;
 }

src/main/java/com/collectionlogmaster/domain/command/CommandResponse.java

@@ -1,10 +1,12 @@
 package com.collectionlogmaster.domain.command;
 
+import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
 @Data
 public class CommandResponse {
     private CommandTask task;
     private String tier;
+    @SerializedName("progressPercentage")
     private int progressPercentage;
 }