diff --git a/build_plugin.sh b/build_plugin.sh index e6189b82f..9b5864e0f 100755 --- a/build_plugin.sh +++ b/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" \ No newline at end of file +echo "Build Success" diff --git a/package.gradle b/package.gradle index 183ecb273..ef5227fe5 100644 --- a/package.gradle +++ b/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) { diff --git a/plugins/bank-heatmap b/plugins/bank-heatmap new file mode 100644 index 000000000..9bd49f54e --- /dev/null +++ b/plugins/bank-heatmap @@ -0,0 +1,2 @@ +repository=https://github.com/raiyni/example-plugin.git +commit=a9a9d2ec15b49c6cc36ff678ae2f4e96cd037778 \ No newline at end of file diff --git a/plugins/bronzeman-mode b/plugins/dekvall-bronzeman-mode similarity index 54% rename from plugins/bronzeman-mode rename to plugins/dekvall-bronzeman-mode index fb5472141..de7bc10d8 100644 --- a/plugins/bronzeman-mode +++ b/plugins/dekvall-bronzeman-mode @@ -1,2 +1,2 @@ repository=https://github.com/dekvall/bronzeman-mode.git -commit=974f590123206a0f324bda5e76dd76e41c769c0f \ No newline at end of file +commit=f8ef6e59d38031b381c7bed47d3d8f3c5eb16d52 \ No newline at end of file diff --git a/plugins/left-click-only b/plugins/left-click-only new file mode 100644 index 000000000..637a739ad --- /dev/null +++ b/plugins/left-click-only @@ -0,0 +1,2 @@ +repository=https://github.com/dekvall/left-click-only.git +commit=7f9d8994d0ddc2cc2ff4c5ee31c19c6c60181cbd \ No newline at end of file diff --git a/plugins/master-farmer b/plugins/master-farmer new file mode 100644 index 000000000..eca202086 --- /dev/null +++ b/plugins/master-farmer @@ -0,0 +1,2 @@ +repository=https://github.com/ConradicalMel/master-farmer.git +commit=0836763af9e9786f8b5225c7f576e8a2594084b8 \ No newline at end of file diff --git a/plugins/orb-hider b/plugins/orb-hider new file mode 100644 index 000000000..14ec19261 --- /dev/null +++ b/plugins/orb-hider @@ -0,0 +1,2 @@ +repository=https://github.com/wizguin/runelite-orb-hider.git +commit=14eadd1e878c676c74029c263efb86cd7473551d diff --git a/plugins/region-locker b/plugins/region-locker index 3aedb2d06..7452c4530 100644 --- a/plugins/region-locker +++ b/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 diff --git a/plugins/spec-regen-timer b/plugins/spec-regen-timer index 24049b527..f9d0f406e 100644 --- a/plugins/spec-regen-timer +++ b/plugins/spec-regen-timer @@ -1,2 +1,2 @@ repository=https://github.com/Bram91/SpecRegenTimerPlugin.git -commit=2b65e18bbf85fc6847a19948182772d2a61635fd +commit=24736fae415150fecc6f1891e1b893fd4df28e81 diff --git a/plugins/supplies-tracker b/plugins/supplies-tracker index c75ca2521..e44942510 100644 --- a/plugins/supplies-tracker +++ b/plugins/supplies-tracker @@ -1,2 +1,2 @@ repository=https://github.com/Dyldozer/SuppliesTrackerExternal.git -commit=1beab95311db8eee02ad28f2840798c41d39fb42 +commit=1beab95311db8eee02ad28f2840798c41d39fb42 \ No newline at end of file diff --git a/plugins/withes-bronzemanmode b/plugins/withes-bronzemanmode index e1e5c88f0..940d1d598 100644 --- a/plugins/withes-bronzemanmode +++ b/plugins/withes-bronzemanmode @@ -1,2 +1,2 @@ repository=https://github.com/robinwithes/withes-bronzemanmode.git -commit=1fe81adcc30e429e9cea04f1c78ef1918bc5f2ff \ No newline at end of file +commit=51d9eac0fd8c3fec2b820b20985e6b5ba43cb6a2 \ No newline at end of file