Refactoring in preparation for Minepacks v3.X

GeorgH93 · Aug 31, 2020 · 8053b5d · 8053b5d
1 parent c491d17
commit 8053b5d
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/...ns/MarriageMaster-MinepacksLegacy/pom.xml → ...nsions/MarriageMaster-MinepacksV1/pom.xml b/...ns/MarriageMaster-MinepacksLegacy/pom.xml → ...nsions/MarriageMaster-MinepacksV1/pom.xml
@@ -1,6 +1,6 @@
 <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>MarriageMaster-MinepacksLegacy</artifactId>
+	<artifactId>MarriageMaster-MinepacksV1</artifactId>
 	<parent>
 		<artifactId>MarriageMaster-Parent</artifactId>
 		<groupId>at.pcgamingfreaks</groupId>
@@ -10,7 +10,7 @@
 	<version>${revision}</version>
 	<packaging>jar</packaging>
 
-	<name>MarriageMaster Minepacks legacy integration</name>
+	<name>MarriageMaster Minepacks V1.x integration</name>
 	<description>The Minepacks integration of Marriage Master.</description>
 
 	<dependencies>

diff --git a/...ckIntegration/MinepacksV1Integration.java → ...ckIntegration/MinepacksV1Integration.java b/...ckIntegration/MinepacksV1Integration.java → ...ckIntegration/MinepacksV1Integration.java
diff --git a/Extensions/MarriageMaster-Minepacks/pom.xml → ...nsions/MarriageMaster-MinepacksV2/pom.xml b/Extensions/MarriageMaster-Minepacks/pom.xml → ...nsions/MarriageMaster-MinepacksV2/pom.xml
@@ -1,6 +1,6 @@
 <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>MarriageMaster-Minepacks</artifactId>
+	<artifactId>MarriageMaster-MinepacksV2</artifactId>
 	<parent>
 		<artifactId>MarriageMaster-Parent</artifactId>
 		<groupId>at.pcgamingfreaks</groupId>
@@ -10,7 +10,7 @@
 	<version>${revision}</version>
 	<packaging>jar</packaging>
 
-	<name>MarriageMaster Minepacks integration</name>
+	<name>MarriageMaster Minepacks V2.x integration</name>
 	<description>The Minepacks integration of Marriage Master.</description>
 
 	<dependencies>

diff --git a/...packIntegration/MinepacksIntegration.java → ...ckIntegration/MinepacksV2Integration.java b/...packIntegration/MinepacksIntegration.java → ...ckIntegration/MinepacksV2Integration.java
@@ -29,14 +29,14 @@
 
 import java.util.MissingResourceException;
 
-public class MinepacksIntegration implements IBackpackIntegration
+public class MinepacksV2Integration implements IBackpackIntegration
 {
 	private static final String PLUGIN_NAME = "Minepacks";
 	private static final Version MIN_VERSION = new Version("2.0");
 	private MinepacksPlugin minepacks;
 	@Getter private final String version;
 
-	public MinepacksIntegration() throws NullPointerException, BackpackPluginIncompatibleException
+	public MinepacksV2Integration() throws NullPointerException, BackpackPluginIncompatibleException
 	{
 		Plugin bukkitPlugin = Bukkit.getPluginManager().getPlugin(PLUGIN_NAME);
 		if(!(bukkitPlugin instanceof MinepacksPlugin)) throw new MissingResourceException("Plugin " + PLUGIN_NAME + " is not available!", this.getClass().getName(), PLUGIN_NAME);

diff --git a/MarriageMaster/pom.xml b/MarriageMaster/pom.xml
@@ -64,12 +64,12 @@
 		</dependency>
 		<dependency>
 			<groupId>at.pcgamingfreaks</groupId>
-			<artifactId>MarriageMaster-Minepacks</artifactId>
+			<artifactId>MarriageMaster-MinepacksV2</artifactId>
 			<version>${revision}</version>
 		</dependency>
 		<dependency>
 			<groupId>at.pcgamingfreaks</groupId>
-			<artifactId>MarriageMaster-MinepacksLegacy</artifactId>
+			<artifactId>MarriageMaster-MinepacksV1</artifactId>
 			<version>${revision}</version>
 		</dependency>
 		<!-- PCGF Plugin Lib -->

diff --git a/.../pcgamingfreaks/MarriageMaster/Bukkit/BackpackIntegration/BackpackIntegrationManager.java b/.../pcgamingfreaks/MarriageMaster/Bukkit/BackpackIntegration/BackpackIntegrationManager.java
@@ -56,7 +56,7 @@ private static void registerCompatiblePlugin(String identifier, VersionRange ver
 	static
 	{
 		registerCompatiblePlugin("MinePacks", new VersionRange("1.17.7", "1.999"), MinepacksV1Integration.class);
-		registerCompatiblePlugin("Minepacks", new VersionRange("2.0-SNAPSHOT", null), MinepacksIntegration.class);
+		registerCompatiblePlugin("Minepacks", new VersionRange("2.0-SNAPSHOT", "2.999"), MinepacksV2Integration.class);
 	}
 
 	public static IBackpackIntegration getIntegration()

diff --git a/pom.xml b/pom.xml
@@ -145,8 +145,8 @@
 	<modules>
 		<module>MarriageMaster-API</module>
 		<module>Extensions/MarriageMaster-BackpackIntegration</module>
-		<module>Extensions/MarriageMaster-MinepacksLegacy</module>
-		<module>Extensions/MarriageMaster-Minepacks</module>
+		<module>Extensions/MarriageMaster-MinepacksV1</module>
+		<module>Extensions/MarriageMaster-MinepacksV2</module>
 		<module>MarriageMaster</module>
 	</modules>