Merge runelite-scripts into runelite-client

pom.xml

@@ -121,7 +121,6 @@
 		<module>runelite-client</module>
 		<module>runelite-mixins</module>
 		<module>runelite-script-assembler-plugin</module>
-		<module>runelite-scripts</module>
 		<module>runescape-api</module>
 		<module>http-api</module>
 		<module>http-service</module>

runelite-client/pom.xml

@@ -108,12 +108,6 @@
 			<version>${project.version}</version>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
-			<groupId>net.runelite</groupId>
-			<artifactId>scripts</artifactId>
-			<version>${project.version}</version>
-			<scope>runtime</scope>
-		</dependency>
 		<dependency>
 			<groupId>net.runelite</groupId>
 			<artifactId>http-api</artifactId>
@@ -277,6 +271,33 @@
 					<artifact>${project.build.directory}/${project.artifactId}-${project.version}-shaded.${project.packaging}</artifact>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>net.runelite</groupId>
+				<artifactId>script-assembler-plugin</artifactId>
+				<version>${project.version}</version>
+				<executions>
+					<execution>
+						<id>assemble</id>
+						<goals>
+							<goal>assemble</goal>
+						</goals>
+						<configuration>
+							<scriptDirectory>src/main/scripts</scriptDirectory>
+							<outputDirectory>${project.build.outputDirectory}/runelite</outputDirectory>
+						</configuration>
+					</execution>
+					<execution>
+						<id>build-index</id>
+						<goals>
+							<goal>build-index</goal>
+						</goals>
+						<configuration>
+							<archiveOverlayDirectory>${project.build.outputDirectory}/runelite</archiveOverlayDirectory>
+							<indexFile>${project.build.outputDirectory}/runelite/index</indexFile>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>

runelite-scripts/pom.xml

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2018, Adam <Adam@sigterm.info>
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>net.runelite</groupId>
-		<artifactId>runelite-parent</artifactId>
-		<version>1.4.9-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>scripts</artifactId>
-	<name>RuneLite Scripts</name>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>net.runelite</groupId>
-				<artifactId>script-assembler-plugin</artifactId>
-				<version>${project.version}</version>
-				<executions>
-					<execution>
-						<id>assemble</id>
-						<goals>
-							<goal>assemble</goal>
-						</goals>
-						<configuration>
-							<scriptDirectory>${project.basedir}/scripts</scriptDirectory>
-							<outputDirectory>${project.build.outputDirectory}/runelite</outputDirectory>
-						</configuration>
-					</execution>
-					<execution>
-						<id>build-index</id>
-						<goals>
-							<goal>build-index</goal>
-						</goals>
-						<configuration>
-							<archiveOverlayDirectory>${project.build.outputDirectory}/runelite</archiveOverlayDirectory>
-							<indexFile>${project.build.outputDirectory}/runelite/index</indexFile>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>