Merge branch 'master' into SuppliesTracker

build_plugin.sh

@@ -59,7 +59,7 @@ pushd "$BUILDDIR"
 
 git clone "$repository" "repo"
 pushd "repo"
-git checkout "$commit"
+git checkout "$commit^{commit}"
 
 SIGNING_KEY="" REPO_CREDS="" gradle \
 	--no-build-cache \
@@ -92,4 +92,4 @@ curl --fail \
 	--upload-file "$BUILDDIR/plugin.jar" "$LOCATION.jar" \
 	"${ICON_UPLOAD[@]}"
 
-echo "Build Success"
+echo "Build Success"

package.gradle

@@ -26,6 +26,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.google.common.hash.Hashing
 import com.google.common.io.Files
 import com.google.gson.Gson
+import java.util.jar.JarFile
 
 initscript {
 	repositories {
@@ -73,7 +74,15 @@ allprojects {
 			new FileInputStream(file("runelite-plugin.properties")).withCloseable { is ->
 				props.load(is)
 			}
+
 			manifest.plugins = props["plugins"].split(/[,:;]/)*.trim()
+			new JarFile(pluginJar).withCloseable{ jf ->
+				manifest.plugins.each { plugin ->
+					if (jf.getEntry(plugin.replaceAll(~/\./, "/") + ".class") == null) {
+						throw new RuntimeException("Plugin class \"" + plugin + "\" is not in the output jar")
+					}
+				}
+			}
 
 			manifest.displayName = props["displayName"]
 			if (!manifest.displayName) {

plugins/bank-heatmap

@@ -0,0 +1,2 @@
+repository=https://github.com/raiyni/example-plugin.git
+commit=a9a9d2ec15b49c6cc36ff678ae2f4e96cd037778

plugins/dekvall-bronzeman-mode

@@ -1,2 +1,2 @@
 repository=https://github.com/dekvall/bronzeman-mode.git
-commit=974f590123206a0f324bda5e76dd76e41c769c0f
+commit=f8ef6e59d38031b381c7bed47d3d8f3c5eb16d52

plugins/left-click-only

@@ -0,0 +1,2 @@
+repository=https://github.com/dekvall/left-click-only.git
+commit=7f9d8994d0ddc2cc2ff4c5ee31c19c6c60181cbd

plugins/master-farmer

@@ -0,0 +1,2 @@
+repository=https://github.com/ConradicalMel/master-farmer.git
+commit=0836763af9e9786f8b5225c7f576e8a2594084b8

plugins/orb-hider

@@ -0,0 +1,2 @@
+repository=https://github.com/wizguin/runelite-orb-hider.git
+commit=14eadd1e878c676c74029c263efb86cd7473551d

plugins/region-locker

@@ -1,2 +1,2 @@
-repository=https://github.com/dekvall/region-locker.git
-commit=8ee9e0f77e53f411b23227a0d95b23e05dc039fd
+repository=https://github.com/slaytostay/region-locker.git
+commit=70d8a31a4d4ef450f1be04357596e6601bcf49b5

plugins/spec-regen-timer

@@ -1,2 +1,2 @@
 repository=https://github.com/Bram91/SpecRegenTimerPlugin.git
-commit=2b65e18bbf85fc6847a19948182772d2a61635fd
+commit=24736fae415150fecc6f1891e1b893fd4df28e81

plugins/supplies-tracker

@@ -1,2 +1,2 @@
 repository=https://github.com/Dyldozer/SuppliesTrackerExternal.git
-commit=1beab95311db8eee02ad28f2840798c41d39fb42
+commit=1beab95311db8eee02ad28f2840798c41d39fb42

plugins/withes-bronzemanmode

@@ -1,2 +1,2 @@
 repository=https://github.com/robinwithes/withes-bronzemanmode.git
-commit=1fe81adcc30e429e9cea04f1c78ef1918bc5f2ff
+commit=51d9eac0fd8c3fec2b820b20985e6b5ba43cb6a2