Update dependencies & bump version to 3.0

TechnicJelle · Jul 22, 2024 · 4deaeaf · 4deaeaf
1 parent 2f809db
commit 4deaeaf
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 37 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,43 +5,55 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.technicjelle</groupId>
-	<artifactId>BlueMapOfflinePlayerMarkers</artifactId>
-	<version>3.0-SNAPSHOT</version>
+	<artifactId>bluemapofflineplayermarkers</artifactId>
+	<version>3.0</version>
 	<packaging>jar</packaging>
 
 	<name>BlueMapOfflinePlayerMarkers</name>
-
 	<description>Adds markers where players have logged off to BlueMap</description>
+	<url>https://github.com/TechnicJelle/BlueMapOfflinePlayerMarkers/</url>
+
 	<properties>
-		<java.version>11</java.version>
+		<java.version>16</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
-	<url>https://github.com/TechnicJelle/BlueMapOfflinePlayerMarkers/</url>
 
 	<build>
+		<finalName>${project.name}-${project.version}</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
+				<version>3.13.0</version>
 				<configuration>
-					<source>${java.version}</source>
-					<target>${java.version}</target>
+					<release>${java.version}</release>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.4.1</version>
+				<version>3.6.0</version>
 				<configuration>
 					<relocations>
 						<relocation>
-							<pattern>com.google</pattern>
-							<shadedPattern>com.technicjelle.bluemapofflineplayermarkers.shadow</shadedPattern>
+							<pattern>com.technicjelle.BMUtils</pattern>
+							<shadedPattern>${project.groupId}.${project.artifactId}.shadow.BMUtils</shadedPattern>
+						</relocation>
+						<relocation>
+							<pattern>com.technicjelle.MCUtils</pattern>
+							<shadedPattern>${project.groupId}.${project.artifactId}.shadow.MCUtils</shadedPattern>
+						</relocation>
+						<relocation>
+							<pattern>com.technicjelle.UpdateChecker</pattern>
+							<shadedPattern>${project.groupId}.${project.artifactId}.shadow.UpdateChecker</shadedPattern>
 						</relocation>
 						<relocation>
 							<pattern>org.bstats</pattern>
-							<shadedPattern>com.technicjelle.bluemapofflineplayermarkers.shadow.bstats</shadedPattern>
+							<shadedPattern>${project.groupId}.${project.artifactId}.shadow.bstats</shadedPattern>
+						</relocation>
+						<relocation>
+							<pattern>org.spongepowered.configurate</pattern>
+							<shadedPattern>${project.groupId}.${project.artifactId}.shadow.configurate</shadedPattern>
 						</relocation>
 					</relocations>
 				</configuration>
@@ -72,50 +84,47 @@
 			<url>https://papermc.io/repo/repository/maven-public/</url>
 		</repository>
 		<repository>
-			<id>sonatype</id>
-			<url>https://oss.sonatype.org/content/groups/public/</url>
-		</repository>
-		<repository>
-			<id>jitpack.io</id>
-			<url>https://jitpack.io</url>
+			<id>bluecolored-releases</id>
+			<name>BlueColored Repository</name>
+			<url>https://repo.bluecolored.de/releases</url>
 		</repository>
 	</repositories>
 
 	<dependencies>
 		<dependency>
-			<groupId>com.github.TechnicJelle</groupId>
-			<artifactId>UpdateCheckerJava</artifactId>
-			<version>v2.3</version>
+			<groupId>com.technicjelle</groupId>
+			<artifactId>UpdateChecker</artifactId>
+			<version>2.5.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.github.TechnicJelle</groupId>
+			<groupId>com.technicjelle</groupId>
 			<artifactId>BMUtils</artifactId>
-			<version>v1.1</version>
+			<version>4.2.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.github.TechnicJelle</groupId>
+			<groupId>com.technicjelle</groupId>
 			<artifactId>MCUtils</artifactId>
-			<version>1.0</version>
+			<version>2.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.destroystokyo.paper</groupId>
 			<artifactId>paper-api</artifactId>
-			<version>1.13-R0.1-SNAPSHOT</version>
+			<version>1.13.2-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.github.BlueMap-Minecraft</groupId>
+			<groupId>de.bluecolored.bluemap</groupId>
 			<artifactId>BlueMapAPI</artifactId>
-			<version>v2.6.1</version>
+			<version>2.7.2</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.github.BlueMap-Minecraft</groupId>
+			<groupId>de.bluecolored.bluenbt</groupId>
 			<artifactId>BlueNBT</artifactId>
-			<version>v1.2.1</version>
+			<version>2.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains</groupId>

diff --git a/...com/technicjelle/bluemapofflineplayermarkers/core/markerhandler/BlueMapMarkerHandler.java b/...com/technicjelle/bluemapofflineplayermarkers/core/markerhandler/BlueMapMarkerHandler.java
@@ -1,7 +1,7 @@
 package com.technicjelle.bluemapofflineplayermarkers.core.markerhandler;
 
 import com.flowpowered.math.vector.Vector3d;
-import com.technicjelle.BMUtils;
+import com.technicjelle.BMUtils.BMSkin;
 import com.technicjelle.bluemapofflineplayermarkers.common.Config;
 import com.technicjelle.bluemapofflineplayermarkers.common.Server;
 import com.technicjelle.bluemapofflineplayermarkers.core.Player;
@@ -52,7 +52,7 @@ public void add(Player player, BlueMapAPI api) {
 		// We need to create a separate marker per map, because the map-storage that the icon is saved in
 		// is different for each map
 		for (BlueMapMap map : blueMapWorld.getMaps()) {
-			markerBuilder.icon(BMUtils.getPlayerHeadIconAddress(api, player.getPlayerUUID(), map), 0, 0); // centered with CSS instead
+			markerBuilder.icon(BMSkin.getPlayerHeadIconAddress(api, player.getPlayerUUID(), map), 0, 0); // centered with CSS instead
 
 			// get marker-set (or create new marker set if none found)
 			MarkerSet markerSet = map.getMarkerSets().computeIfAbsent(Config.MARKER_SET_ID, id -> MarkerSet.builder()

diff --git a/.../com/technicjelle/bluemapofflineplayermarkers/impl/paper/BlueMapOfflinePlayerMarkers.java b/.../com/technicjelle/bluemapofflineplayermarkers/impl/paper/BlueMapOfflinePlayerMarkers.java
@@ -1,6 +1,6 @@
 package com.technicjelle.bluemapofflineplayermarkers.impl.paper;
 
-import com.technicjelle.BMUtils;
+import com.technicjelle.BMUtils.BMCopy;
 import com.technicjelle.UpdateChecker;
 import com.technicjelle.bluemapofflineplayermarkers.core.BMApiStatus;
 import com.technicjelle.bluemapofflineplayermarkers.core.Player;
@@ -32,8 +32,8 @@ public void onLoad() {
 		BlueMapAPI.onEnable(api -> {
 			getLogger().info("BlueMap is enabled! Copying resources to BlueMap webapp and registering them...");
 			try {
-				BMUtils.copyJarResourceToBlueMap(api, getClassLoader(), "style.css", "bmopm.css", false);
-				BMUtils.copyJarResourceToBlueMap(api, getClassLoader(), "script.js", "bmopm.js", false);
+				BMCopy.jarResourceToWebApp(api, getClassLoader(), "style.css", "bmopm.css", false);
+				BMCopy.jarResourceToWebApp(api, getClassLoader(), "script.js", "bmopm.js", false);
 			} catch (IOException e) {
 				Singletons.getLogger().log(Level.SEVERE, "Failed to copy resources to BlueMap webapp!", e);
 			}

diff --git a/src/main/java/com/technicjelle/bluemapofflineplayermarkers/impl/paper/PaperConfig.java b/src/main/java/com/technicjelle/bluemapofflineplayermarkers/impl/paper/PaperConfig.java
@@ -1,6 +1,6 @@
 package com.technicjelle.bluemapofflineplayermarkers.impl.paper;
 
-import com.technicjelle.MCUtils;
+import com.technicjelle.MCUtils.ConfigUtils;
 import com.technicjelle.bluemapofflineplayermarkers.common.Config;
 import com.technicjelle.bluemapofflineplayermarkers.core.GameMode;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -23,7 +23,7 @@ public PaperConfig(JavaPlugin plugin) {
 
 	public void loadFromPlugin(JavaPlugin plugin) {
 		try {
-			MCUtils.copyPluginResourceToConfigDir(plugin, "config.yml", "config.yml", false);
+			ConfigUtils.copyPluginResourceToConfigDir(plugin, "config.yml", "config.yml", false);
 		} catch (IOException e) {
 			throw new RuntimeException(e);
 		}