plugins: Add more plugins v2

.github/workflows/pr.yml

@@ -35,8 +35,8 @@ jobs:
 
       - uses: actions/checkout@v1
         with:
-          repository: open-osrs/runelite
-          ref: master
+          repository: Owain94/runelite-extended
+          ref: externals-rework
 
       - uses: actions/cache@v1
         with:
@@ -47,19 +47,19 @@ jobs:
 
       - name: Make gradlew executable (client)
         run: chmod +x ./gradlew
-        working-directory: /home/runner/work/plugins/runelite
+        working-directory: /home/runner/work/plugins/runelite-extended
 
       - name: Assembling client
         run: ./gradlew assemble --console=plain
-        working-directory: /home/runner/work/plugins/runelite
+        working-directory: /home/runner/work/plugins/runelite-extended
 
       - name: Building client
         run: ./gradlew build --stacktrace -x test -x checkstyleMain --console=plain
-        working-directory: /home/runner/work/plugins/runelite
+        working-directory: /home/runner/work/plugins/runelite-extended
 
       - name: Upload client artifacts to local maven
         run: ./gradlew publishToMavenLocal --console=plain
-        working-directory: /home/runner/work/plugins/runelite
+        working-directory: /home/runner/work/plugins/runelite-extended
 
       - name: Make gradlew executable (plugins)
         run: chmod +x ./gradlew

.github/workflows/push.yml

@@ -25,24 +25,24 @@ jobs:
 
       - uses: actions/checkout@v1
         with:
-          repository: open-osrs/runelite
-          ref: master
+          repository: Owain94/runelite-extended
+          ref: externals-rework
 
       - name: Make gradlew executable (client)
         run: chmod +x ./gradlew
-        working-directory: /home/runner/work/plugins/runelite
+        working-directory: /home/runner/work/plugins/runelite-extended
 
       - name: Assembling client
         run: ./gradlew assemble --console=plain
-        working-directory: /home/runner/work/plugins/runelite
+        working-directory: /home/runner/work/plugins/runelite-extended
 
       - name: Building client
         run: ./gradlew build --stacktrace -x test -x checkstyleMain --console=plain
-        working-directory: /home/runner/work/plugins/runelite
+        working-directory: /home/runner/work/plugins/runelite-extended
 
       - name: Upload client artifacts to local maven
         run: ./gradlew publishToMavenLocal --console=plain
-        working-directory: /home/runner/work/plugins/runelite
+        working-directory: /home/runner/work/plugins/runelite-extended
 
       - name: Make gradlew executable (plugins)
         run: chmod +x ./gradlew

achievementdiary/achievementdiary.gradle.kts

@@ -25,10 +25,10 @@ import ProjectVersions.rlVersion
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-description = "Diary Requirements"
 version = "0.0.1"
 
-val deps = configurations.create("deps")
+project.extra["PluginName"] = "Diary Requirements"
+project.extra["PluginDescription"] = "Display level requirements in Achievement Diary interface"
 
 dependencies {
     annotationProcessor(Libraries.lombok)
@@ -48,15 +48,11 @@ tasks {
         manifest {
             attributes(mapOf(
                     "Plugin-Version" to project.version,
-                    "Plugin-Id" to nameToId(project.name),
-                    "Plugin-Class" to "net.runelite.client.plugins.achievementdiary.DiaryRequirementsPluginWrapper",
-                    "Plugin-Provider" to "OpenOSRS",
-                    "Plugin-Dependencies" to "",
-                    "Plugin-Description" to "Display level requirements in Achievement Diary interface",
-                    "Plugin-License" to "3-Clause BSD License"
+                    "Plugin-Id" to nameToId(project.extra["PluginName"] as String),
+                    "Plugin-Provider" to project.extra["PluginProvider"],
+                    "Plugin-Description" to project.extra["PluginDescription"],
+                    "Plugin-License" to project.extra["PluginLicense"]
             ))
         }
-
-        from(deps.map { if (it.isDirectory) it else zipTree(it) })
     }
 }

achievementdiary/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java

@@ -48,6 +48,7 @@
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
+import net.runelite.client.plugins.PluginType;
 import net.runelite.client.plugins.achievementdiary.diaries.ArdougneDiaryRequirement;
 import net.runelite.client.plugins.achievementdiary.diaries.DesertDiaryRequirement;
 import net.runelite.client.plugins.achievementdiary.diaries.FaladorDiaryRequirement;
@@ -67,7 +68,8 @@
 @PluginDescriptor(
 	name = "Diary Requirements",
 	description = "Display level requirements in Achievement Diary interface",
-	tags = {"achievements", "tasks"}
+	tags = {"achievements", "tasks"},
+	type = PluginType.UTILITY
 )
 @Singleton
 public class DiaryRequirementsPlugin extends Plugin

agility/agility.gradle.kts

@@ -25,10 +25,10 @@ import ProjectVersions.rlVersion
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-description = "Agility"
 version = "0.0.1"
 
-val deps = configurations.create("deps")
+project.extra["PluginName"] = "Agility"
+project.extra["PluginDescription"] = "Show helpful information about agility courses and obstacles"
 
 dependencies {
     annotationProcessor(Libraries.lombok)
@@ -49,15 +49,11 @@ tasks {
         manifest {
             attributes(mapOf(
                     "Plugin-Version" to project.version,
-                    "Plugin-Id" to nameToId(project.name),
-                    "Plugin-Class" to "net.runelite.client.plugins.agility.AgilityPluginWrapper",
-                    "Plugin-Provider" to "OpenOSRS",
-                    "Plugin-Dependencies" to "",
-                    "Plugin-Description" to "Show helpful information about agility courses and obstacles",
-                    "Plugin-License" to "3-Clause BSD License"
+                    "Plugin-Id" to nameToId(project.extra["PluginName"] as String),
+                    "Plugin-Provider" to project.extra["PluginProvider"],
+                    "Plugin-Description" to project.extra["PluginDescription"],
+                    "Plugin-License" to project.extra["PluginLicense"]
             ))
         }
-
-        from(deps.map { if (it.isDirectory) it else zipTree(it) })
     }
 }

agility/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java

@@ -77,6 +77,7 @@
 import net.runelite.client.game.ItemManager;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
+import net.runelite.client.plugins.PluginType;
 import net.runelite.client.ui.overlay.OverlayManager;
 import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
 import net.runelite.client.util.ColorUtil;
@@ -86,7 +87,8 @@
 @PluginDescriptor(
 	name = "Agility",
 	description = "Show helpful information about agility courses and obstacles",
-	tags = {"grace", "marks", "overlay", "shortcuts", "skilling", "traps"}
+	tags = {"grace", "marks", "overlay", "shortcuts", "skilling", "traps"},
+	type = PluginType.SKILLING
 )
 @Slf4j
 @Singleton

alchemicalhydra/alchemicalhydra.gradle.kts

@@ -0,0 +1,59 @@
+import ProjectVersions.rlVersion
+
+/*
+ * Copyright (c) 2019 Owain van Brakel <https://github.com/Owain94>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+version = "0.0.1"
+
+project.extra["PluginName"] = "Alchemical Hydra"
+project.extra["PluginDescription"] = "Show what to pray against hydra"
+
+dependencies {
+    annotationProcessor(Libraries.lombok)
+    annotationProcessor(Libraries.pf4j)
+
+    compileOnly("com.openosrs:runelite-api:$rlVersion")
+    compileOnly("com.openosrs:runelite-client:$rlVersion")
+
+    compileOnly(Libraries.guice)
+    compileOnly(Libraries.javax)
+    compileOnly(Libraries.lombok)
+    compileOnly(Libraries.rxjava)
+    compileOnly(Libraries.pf4j)
+}
+
+tasks {
+    jar {
+        manifest {
+            attributes(mapOf(
+                    "Plugin-Version" to project.version,
+                    "Plugin-Id" to nameToId(project.extra["PluginName"] as String),
+                    "Plugin-Provider" to project.extra["PluginProvider"],
+                    "Plugin-Description" to project.extra["PluginDescription"],
+                    "Plugin-License" to project.extra["PluginLicense"]
+            ))
+        }
+    }
+}