From 4d111eca9db54b114e3a86d0bbd83f3be817ec12 Mon Sep 17 00:00:00 2001
From: GeorgH93 <git@georgh93.eu>
Date: Wed, 22 Feb 2023 23:29:29 +0100
Subject: [PATCH] Move paper module to Components dir

---
 .../Minepacks-Bootstrap-Paper}/pom.xml        | 38 +++++++++++++++++--
 .../resources/paper-plugin.yml                |  0
 .../Minepacks/Paper/MinepacksBootstrap.java   |  0
 Minepacks/pom.xml                             |  5 +--
 pom.xml                                       |  3 +-
 5 files changed, 39 insertions(+), 7 deletions(-)
 rename {Minepacks-Paper => Components/Minepacks-Bootstrap-Paper}/pom.xml (53%)
 rename {Minepacks-Paper => Components/Minepacks-Bootstrap-Paper}/resources/paper-plugin.yml (100%)
 rename {Minepacks-Paper => Components/Minepacks-Bootstrap-Paper}/src/at/pcgamingfreaks/Minepacks/Paper/MinepacksBootstrap.java (100%)

diff --git a/Minepacks-Paper/pom.xml b/Components/Minepacks-Bootstrap-Paper/pom.xml
similarity index 53%
rename from Minepacks-Paper/pom.xml
rename to Components/Minepacks-Bootstrap-Paper/pom.xml
index 9ca622a..ede2a5f 100644
--- a/Minepacks-Paper/pom.xml
+++ b/Components/Minepacks-Bootstrap-Paper/pom.xml
@@ -1,17 +1,17 @@
 <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-Paper</artifactId>
+	<artifactId>Minepacks-Bootstrap-Paper</artifactId>
 	<parent>
 		<artifactId>Minepacks-Parent</artifactId>
 		<groupId>at.pcgamingfreaks</groupId>
 		<version>${revision}</version>
-		<relativePath>..</relativePath>
+		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<version>${revision}</version>
 	<packaging>jar</packaging>
 
-	<name>Minepacks-Paper</name>
+	<name>Minepacks-Bootstrap-Paper</name>
 	<description>Paper API extension for Minepacks.</description>
 
 	<repositories>
@@ -22,6 +22,16 @@
 	</repositories>
 
 	<dependencies>
+		<dependency>
+			<groupId>at.pcgamingfreaks.pcgf_pluginlib</groupId>
+			<artifactId>pcgf_pluginlib-version</artifactId>
+			<version>${pcgfPluginLibVersion}</version>
+		</dependency>
+		<dependency>
+			<groupId>at.pcgamingfreaks.pcgf_pluginlib</groupId>
+			<artifactId>pcgf_pluginlib-version_detection</artifactId>
+			<version>${pcgfPluginLibVersion}</version>
+		</dependency>
 		<dependency>
 			<groupId>io.papermc.paper</groupId>
 			<artifactId>paper-api</artifactId>
@@ -48,6 +58,28 @@
 					<release>17</release>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>${mavenShade.version}</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<createDependencyReducedPom>false</createDependencyReducedPom>
+							<minimizeJar>false</minimizeJar>
+							<artifactSet>
+								<includes>
+									<include>at.pcgamingfreaks.pcgf_pluginlib:pcgf_pluginlib-version_detection</include>
+								</includes>
+							</artifactSet>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/Minepacks-Paper/resources/paper-plugin.yml b/Components/Minepacks-Bootstrap-Paper/resources/paper-plugin.yml
similarity index 100%
rename from Minepacks-Paper/resources/paper-plugin.yml
rename to Components/Minepacks-Bootstrap-Paper/resources/paper-plugin.yml
diff --git a/Minepacks-Paper/src/at/pcgamingfreaks/Minepacks/Paper/MinepacksBootstrap.java b/Components/Minepacks-Bootstrap-Paper/src/at/pcgamingfreaks/Minepacks/Paper/MinepacksBootstrap.java
similarity index 100%
rename from Minepacks-Paper/src/at/pcgamingfreaks/Minepacks/Paper/MinepacksBootstrap.java
rename to Components/Minepacks-Bootstrap-Paper/src/at/pcgamingfreaks/Minepacks/Paper/MinepacksBootstrap.java
diff --git a/Minepacks/pom.xml b/Minepacks/pom.xml
index e6451bc..a2db7bf 100644
--- a/Minepacks/pom.xml
+++ b/Minepacks/pom.xml
@@ -25,7 +25,6 @@
 		<mainClass>${project.groupId}.${project.artifactId}.Bukkit.${project.artifactId}</mainClass>
 		<releaseType>Normal</releaseType>
 		<updateChannel>Release</updateChannel>
-		<mavenShade.version>3.3.0</mavenShade.version>
 	</properties>
 
 	<pluginRepositories>
@@ -239,7 +238,7 @@
 				</dependency>
 				<dependency>
 					<groupId>at.pcgamingfreaks</groupId>
-					<artifactId>Minepacks-Paper</artifactId>
+					<artifactId>Minepacks-Bootstrap-Paper</artifactId>
 					<version>${project.version}</version>
 				</dependency>
 			</dependencies>
@@ -264,7 +263,7 @@
 										<includes>
 											<include>at.pcgamingfreaks:Minepacks-API</include>
 											<include>at.pcgamingfreaks:Minepacks-MagicValues</include>
-											<include>at.pcgamingfreaks:Minepacks-Paper</include>
+											<include>at.pcgamingfreaks:Minepacks-Bootstrap-Paper</include>
 											<include>at.pcgamingfreaks:BadRabbit-Bukkit</include>
 											<include>at.pcgamingfreaks:Minepacks-BadRabbit-Bukkit</include>
 											<include>at.pcgamingfreaks:Minepacks</include>
diff --git a/pom.xml b/pom.xml
index 8b6f9d9..a6bfce4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,7 @@
 		<pcgfPluginLibVersion>1.0.39-SNAPSHOT</pcgfPluginLibVersion>
 
 		<bukkitVersion>1.15.2-R0.1-SNAPSHOT</bukkitVersion>
+		<mavenShade.version>3.4.1</mavenShade.version>
 
 		<sonar.organization>georgh93</sonar.organization>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
@@ -162,7 +163,7 @@
 
 			<modules>
 				<module>Components/Minepacks-BadRabbit-Bukkit</module>
-				<module>Minepacks-Paper</module>
+				<module>Components/Minepacks-Bootstrap-Paper</module>
 			</modules>
 		</profile>
 	</profiles>