From 350aaa60a6276dda88dee5903caf22f0b801bd1d Mon Sep 17 00:00:00 2001
From: GeorgH93 <git@georgh93.eu>
Date: Sun, 29 Jan 2023 14:20:50 +0100
Subject: [PATCH] Move BadRabbit loader into it's own submodule

---
 Components/Minepacks-BadRabbit-Bukkit/pom.xml | 45 +++++++++++++++++++
 .../Minepacks/Bukkit/MinepacksBadRabbit.java  |  0
 Components/Minepacks-MagicValues/pom.xml      |  1 -
 Minepacks/pom.xml                             | 11 ++---
 pom.xml                                       | 10 ++++-
 5 files changed, 60 insertions(+), 7 deletions(-)
 create mode 100644 Components/Minepacks-BadRabbit-Bukkit/pom.xml
 rename {Minepacks => Components/Minepacks-BadRabbit-Bukkit}/src/at/pcgamingfreaks/Minepacks/Bukkit/MinepacksBadRabbit.java (100%)

diff --git a/Components/Minepacks-BadRabbit-Bukkit/pom.xml b/Components/Minepacks-BadRabbit-Bukkit/pom.xml
new file mode 100644
index 0000000..3cf49e1
--- /dev/null
+++ b/Components/Minepacks-BadRabbit-Bukkit/pom.xml
@@ -0,0 +1,45 @@
+<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>
+	<artifactId>Minepacks-BadRabbit-Bukkit</artifactId>
+	<parent>
+		<artifactId>Minepacks-Parent</artifactId>
+		<groupId>at.pcgamingfreaks</groupId>
+		<version>${revision}</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+	<version>${revision}</version>
+	<packaging>jar</packaging>
+
+	<name>Minepacks-BadRabbit-Bukkit</name>
+	<description>BadRabbit loader for Minepacks.</description>
+	<url>https://www.spigotmc.org/resources/19286/</url>
+
+	<dependencies>
+		<dependency>
+			<groupId>at.pcgamingfreaks</groupId>
+			<artifactId>Minepacks-MagicValues</artifactId>
+			<version>${revision}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>at.pcgamingfreaks.pcgf_pluginlib</groupId>
+			<artifactId>pcgf_pluginlib-common</artifactId>
+			<version>${pcgfPluginLibVersion}</version>
+			<scope>provided</scope>
+		</dependency>
+		<!-- BadRabbit -->
+		<dependency>
+			<groupId>at.pcgamingfreaks</groupId>
+			<artifactId>BadRabbit-Bukkit</artifactId>
+			<version>1.11</version>
+			<scope>provided</scope>
+		</dependency>
+		<!-- Bukkit -->
+		<dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>${bukkitVersion}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/MinepacksBadRabbit.java b/Components/Minepacks-BadRabbit-Bukkit/src/at/pcgamingfreaks/Minepacks/Bukkit/MinepacksBadRabbit.java
similarity index 100%
rename from Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/MinepacksBadRabbit.java
rename to Components/Minepacks-BadRabbit-Bukkit/src/at/pcgamingfreaks/Minepacks/Bukkit/MinepacksBadRabbit.java
diff --git a/Components/Minepacks-MagicValues/pom.xml b/Components/Minepacks-MagicValues/pom.xml
index 76b9fdd..e435c67 100644
--- a/Components/Minepacks-MagicValues/pom.xml
+++ b/Components/Minepacks-MagicValues/pom.xml
@@ -15,7 +15,6 @@
 
 	<build>
 		<defaultGoal>clean install</defaultGoal>
-		<sourceDirectory>src</sourceDirectory>
 		<resources>
 			<resource>
 				<directory>resources</directory>
diff --git a/Minepacks/pom.xml b/Minepacks/pom.xml
index 6454080..9783d94 100644
--- a/Minepacks/pom.xml
+++ b/Minepacks/pom.xml
@@ -26,10 +26,6 @@
 		<releaseType>Normal</releaseType>
 		<updateChannel>Release</updateChannel>
 		<mavenShade.version>3.3.0</mavenShade.version>
-
-		<configFileVersion>33</configFileVersion>
-		<languageFileVersion>20</languageFileVersion>
-		<pcgfPluginLibVersion>1.0.39-SNAPSHOT</pcgfPluginLibVersion>
 	</properties>
 
 	<pluginRepositories>
@@ -74,7 +70,6 @@
 
 	<build>
 		<defaultGoal>clean package test</defaultGoal>
-		<sourceDirectory>src</sourceDirectory>
 		<testSourceDirectory>test/src</testSourceDirectory>
 		<resources>
 			<resource>
@@ -260,6 +255,11 @@
 					<version>${project.version}</version>
 					<classifier>Standalone</classifier>
 				</dependency>
+				<dependency>
+					<groupId>at.pcgamingfreaks</groupId>
+					<artifactId>Minepacks-BadRabbit-Bukkit</artifactId>
+					<version>${project.version}</version>
+				</dependency>
 			</dependencies>
 			<build>
 				<plugins>
@@ -283,6 +283,7 @@
 											<include>at.pcgamingfreaks:Minepacks-API</include>
 											<include>at.pcgamingfreaks:Minepacks-MagicValues</include>
 											<include>at.pcgamingfreaks:BadRabbit-Bukkit</include>
+											<include>at.pcgamingfreaks:Minepacks-BadRabbit-Bukkit</include>
 											<include>at.pcgamingfreaks:Minepacks</include>
 										</includes>
 									</artifactSet>
diff --git a/pom.xml b/pom.xml
index 04b66e9..6a8f399 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,6 +11,12 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
+		<configFileVersion>33</configFileVersion>
+		<languageFileVersion>20</languageFileVersion>
+		<pcgfPluginLibVersion>1.0.39-SNAPSHOT</pcgfPluginLibVersion>
+
+		<bukkitVersion>1.15.2-R0.1-SNAPSHOT</bukkitVersion>
+
 		<sonar.organization>georgh93</sonar.organization>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
 	</properties>
@@ -62,7 +68,7 @@
 		<dependency>
 			<groupId>org.bukkit</groupId>
 			<artifactId>bukkit</artifactId>
-			<version>1.15.2-R0.1-SNAPSHOT</version>
+			<version>${bukkitVersion}</version>
 			<scope>provided</scope>
 		</dependency>
 		<!-- Lombok -->
@@ -76,6 +82,7 @@
 
 	<build>
 		<defaultGoal>clean package</defaultGoal>
+		<sourceDirectory>src</sourceDirectory>
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -143,6 +150,7 @@
 	<modules>
 		<module>Minepacks-API</module>
 		<module>Components/Minepacks-MagicValues</module>
+		<module>Components/Minepacks-BadRabbit-Bukkit</module>
 		<module>Minepacks</module>
 	</modules>